mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve renderer mappings (#215) 

* Improve renderer mappings

*Dispatcher, DefaultEntityRenderer:
- See https://notch.tumblr.com/post/581187056/evolution-of-the-entityrenderdispatcher

Cube, Polygon:
- See the very old (RubyDung) versions pre-obfuscation
- Cube is used in the Bedrock entity model JSONs, see https://minecraft.gamepedia.com/Tutorials/Changing_Minecraft_entity_models

* Correct Polygon mapping

* Cube -> Cuboid; CubeBox -> Box

* Remaining minor things

* EntityModel -> Model

* ChunkRenderDispatcher

* Fix Polygon package
This commit is contained in:
Jamie Mansfield 2018-11-29 20:07:08 +00:00 committed by Adrian Siekierka
parent 56b40168df
commit dab4cc0f7a
26 changed files with 140 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mappings/cvs.mapping
View File

@ -2,6 +2,7 @@ CLASS cvs
METHOD <init> (FFII)V
ARG 1 scale
ARG 3 textureWidth
ARG 4 textureHeight
METHOD a setRotationAngles (FFFFFFLagf;)V
ARG 1 limbMoveAngle
ARG 2 limbMoveAmount

2
mappings/dhe.mapping
View File

@ -1,2 +0,0 @@
CLASS dhe
METHOD a getTexture (Lagf;)Lpy;

12
mappings/net/minecraft/client/model/Box.mapping Normal file
View File

@ -0,0 +1,12 @@
CLASS cye net/minecraft/client/model/Box
FIELD g name Ljava/lang/String;
FIELD h vertices [Lcxs;
FIELD i polygons [Lcwt;
METHOD <init> (Lcyg;IIFFFIIIF)V
ARG 1 parent
METHOD <init> (Lcyg;IIFFFIIIFZ)V
ARG 1 parent
ARG 11 mirror
METHOD a render (Lcmo;F)V
METHOD a setName (Ljava/lang/String;)Lcye;
ARG 1 name

51
mappings/net/minecraft/client/model/Cuboid.mapping Normal file
View File

@ -0,0 +1,51 @@
CLASS cyg net/minecraft/client/model/Cuboid
FIELD a textureWidth F
FIELD b textureHeight F
FIELD c rotationPointX F
FIELD d rotationPointY F
FIELD e rotationPointZ F
FIELD f pitch F
FIELD g yaw F
FIELD h roll F
FIELD i mirror Z
FIELD j visible Z
FIELD l boxes Ljava/util/List;
FIELD m children Ljava/util/List;
FIELD n name Ljava/lang/String;
FIELD o x F
FIELD p y F
FIELD q z F
FIELD r textureOffsetX I
FIELD s textureOffsetY I
FIELD t compiled Z
FIELD u list I
FIELD v owner Lcwk;
METHOD <init> (Lcwk;)V
ARG 1 owner
METHOD <init> (Lcwk;II)V
ARG 1 owner
ARG 2 textureOffsetX
ARG 3 textureOffsetY
METHOD <init> (Lcwk;Ljava/lang/String;)V
ARG 1 owner
ARG 2 name
METHOD a render (F)V
METHOD a setRotationPoint (FFF)V
ARG 1 x
ARG 2 y
ARG 3 z
METHOD a addBox (FFFIII)Lcyg;
METHOD a addBox (FFFIIIF)V
METHOD a addBox (FFFIIIFZ)V
METHOD a addBox (FFFIIIZ)Lcyg;
METHOD a setTextureOffset (II)Lcyg;
ARG 1 x
ARG 2 y
METHOD a addChild (Lcyg;)V
ARG 1 cube
METHOD a addBox (Ljava/lang/String;FFFIII)Lcyg;
METHOD a addBox (Ljava/lang/String;FFFIIIF)Lcyg;
METHOD b setTextureSize (II)Lcyg;
ARG 1 width
ARG 2 height
METHOD d compile (F)V

7
mappings/net/minecraft/client/render/entity/model/EntityModel.mapping → mappings/net/minecraft/client/model/Model.mapping
View File

@ -1,9 +1,9 @@
CLASS cwk net/minecraft/client/render/entity/model/EntityModel
CLASS cwk net/minecraft/client/model/Model
FIELD a textureMap Ljava/util/Map;
FIELD n swingProgress F
FIELD o isRiding Z
FIELD p isChild Z
FIELD q boxes Ljava/util/List;
FIELD q cuboids Ljava/util/List;
FIELD r textureWidth I
FIELD s textureHeight I
METHOD a setRotationAngles (FFFFFFLagf;)V
@ -19,6 +19,7 @@ CLASS cwk net/minecraft/client/render/entity/model/EntityModel
ARG 2 swingAmount
ARG 3 swingDelta
METHOD a setAttributes (Lcwk;)V
ARG 1 model
METHOD a copyAngles (Lcyg;Lcyg;)V
ARG 0 original
ARG 1 copy
@ -26,4 +27,6 @@ CLASS cwk net/minecraft/client/render/entity/model/EntityModel
METHOD a setTextureOffset (Ljava/lang/String;II)V
ARG 1 id
ARG 2 x
ARG 3 y
METHOD a getRandomBox (Ljava/util/Random;)Lcyg;
ARG 1 random

9
mappings/net/minecraft/client/model/Polygon.mapping Normal file
View File

@ -0,0 +1,9 @@
CLASS cwt net/minecraft/client/model/Polygon
FIELD a vertices [Lcxs;
FIELD b vertexCount I
METHOD <init> ([Lcxs;)V
ARG 1 vertices
METHOD <init> ([Lcxs;IIIIFF)V
ARG 1 vertices
METHOD a flip ()V
METHOD a render (Lcmo;F)V

21
mappings/net/minecraft/client/model/Vertex.mapping Normal file
View File

@ -0,0 +1,21 @@
CLASS cxs net/minecraft/client/model/Vertex
FIELD a pos Lcjy;
FIELD b u F
FIELD c v F
METHOD <init> (FFFFF)V
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 u
ARG 5 v
METHOD <init> (Lcjy;FF)V
ARG 1 pos
ARG 2 u
ARG 3 v
METHOD <init> (Lcxs;FF)V
ARG 1 vertex
ARG 2 u
ARG 3 v
METHOD a remap (FF)Lcxs;
ARG 1 u
ARG 2 v

1
mappings/net/minecraft/client/render/EntityTextureOffset.mapping
View File

@ -3,3 +3,4 @@ CLASS cyh net/minecraft/client/render/EntityTextureOffset
FIELD b offsetY I
METHOD <init> (II)V
ARG 1 offsetX
ARG 2 offsetY

3
mappings/net/minecraft/client/render/Renderer.mapping
View File

@ -17,8 +17,9 @@ CLASS dbm net/minecraft/client/render/Renderer
FIELD g FORCEFIELD_TEX Lpy;
FIELD h game Lcnd;
FIELD i textureManager Ldkt;
FIELD j entityRenderManager Ldfy;
FIELD j entityRenderDispatcher Ldfy;
FIELD k world Lcyq;
FIELD o chunkRenderDispatcher Ldbw;
METHOD a renderSky (F)V
METHOD a markRegionForRenderUpdate (IIIZ)V
METHOD a onGlobalWorldEvent (ILet;I)V

1
mappings/net/minecraft/client/render/WorldRenderer.mapping
View File

@ -7,6 +7,7 @@ CLASS dbi net/minecraft/client/render/WorldRenderer
FIELD g resourceContainer Lwa;
FIELD h rand Ljava/util/Random;
METHOD a onSetCameraEntity (Lagf;)V
METHOD a loadShader (Lpy;)V
METHOD a onResourceReload (Lwa;)V
METHOD e tick ()V
METHOD l getGame ()Lcnd;

7
mappings/net/minecraft/client/render/block/entity/BlockEntityRenderManager.mapping → mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping
View File

@ -1,5 +1,5 @@
CLASS ddi net/minecraft/client/render/block/entity/BlockEntityRenderManager
FIELD a instance Lddi;
CLASS ddi net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher
FIELD a INSTANCE Lddi;
FIELD b renderOffsetX D
FIELD c renderOffsetY D
FIELD d renderOffsetZ D
@ -12,10 +12,11 @@ CLASS ddi net/minecraft/client/render/block/entity/BlockEntityRenderManager
FIELD k cameraX D
FIELD l cameraY D
FIELD m cameraZ D
FIELD n blockEntityRenderers Ljava/util/Map;
FIELD n renderers Ljava/util/Map;
FIELD o fontRenderer Lcnq;
METHOD a getFontRenderer ()Lcnq;
METHOD a setWorld (Lban;)V
ARG 1 world
METHOD a configure (Lban;Ldkt;Lcnq;Lagf;Lcjv;F)V
METHOD a get (Lbmk;)Lddj;
METHOD a renderEntity (Lbmk;DDDF)V

4
mappings/net/minecraft/client/render/bpk.mapping
View File

@ -1,4 +0,0 @@
CLASS dbw net/minecraft/client/render/bpk
FIELD b world Lban;
METHOD <init> (Lban;ILdbm;Ldec;)V
ARG 1 world

8
mappings/net/minecraft/client/render/chunk/ChunkRenderDispatcher.mapping Normal file
View File

@ -0,0 +1,8 @@
CLASS dbw net/minecraft/client/render/chunk/ChunkRenderDispatcher
FIELD a renderer Ldbm;
FIELD b world Lban;
FIELD f renderers [Ldeb;
METHOD <init> (Lban;ILdbm;Ldec;)V
ARG 1 world
ARG 3 renderer
ARG 4 factory

3
mappings/net/minecraft/client/render/entity/CatEntityRenderer.mapping Normal file
View File

@ -0,0 +1,3 @@
CLASS dfh net/minecraft/client/render/entity/CatEntityRenderer
METHOD a getTexture (Lagf;)Lpy;
METHOD a getTexture (Lall;)Lpy;

2
mappings/net/minecraft/client/render/entity/DefaultEntityRenderer.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS dfo net/minecraft/client/render/entity/DefaultEntityRenderer
METHOD a getTexture (Lagf;)Lpy;

2
mappings/dfs.mapping → mappings/net/minecraft/client/render/entity/DrownedEntityRenderer.mapping
View File

@ -1,4 +1,4 @@
CLASS dfs
CLASS dfs net/minecraft/client/render/entity/DrownedEntityRenderer
CLASS dfs$1
METHOD ao_ init ()V
METHOD a getTexture (Lagf;)Lpy;

2
mappings/net/minecraft/client/render/entity/EntityEntityRenderer.mapping
View File

@ -1,2 +0,0 @@
CLASS dfo net/minecraft/client/render/entity/EntityEntityRenderer
METHOD a getTexture (Lagf;)Lpy;

13
mappings/net/minecraft/client/render/entity/EntityRenderManager.mapping → mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
View File

@ -1,18 +1,21 @@
CLASS dfy net/minecraft/client/render/entity/EntityRenderManager
CLASS dfy net/minecraft/client/render/entity/EntityRenderDispatcher
FIELD a textureManager Ldkt;
FIELD b world Lban;
FIELD g settings Lcnf;
FIELD k RENDER_MAP Ljava/util/Map;
FIELD l SKIN_MAP Ljava/util/Map;
FIELD m PLAYER_RENDERER Ldkf;
FIELD k renderers Ljava/util/Map;
FIELD l skinMap Ljava/util/Map;
FIELD m playerRenderer Ldkf;
FIELD n fontRenderer Lcnq;
FIELD o renderPosX D
FIELD p renderPosY D
FIELD q renderPosZ D
METHOD <init> (Ldkt;Ldgt;)V
ARG 1 textureManager
ARG 2 itemRenderer
METHOD a setRenderPosition (DDD)V
ARG 1 posX
ARG 1 x
ARG 3 y
ARG 5 z
METHOD a getRenderer (Lagf;)Ldfz;
METHOD a getRenderer (Ljava/lang/Class;)Ldfz;
METHOD b hasSecondPass (Lagf;)Z

3
mappings/net/minecraft/client/render/entity/OcelotEntityRenderer.mapping
View File

@ -1,3 +1,2 @@
CLASS dfh net/minecraft/client/render/entity/OcelotEntityRenderer
CLASS dhe net/minecraft/client/render/entity/OcelotEntityRenderer
METHOD a getTexture (Lagf;)Lpy;
METHOD a getTexture (Lall;)Lpy;

2
mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping
View File

@ -1,2 +1,4 @@
CLASS cvh net/minecraft/client/render/entity/model/BedEntityModel
METHOD a render ()V
METHOD a setVisible (Z)V
ARG 1 value

2
mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping
View File

@ -12,6 +12,7 @@ CLASS cwa net/minecraft/client/render/entity/model/BipedEntityModel
METHOD <init> (FFII)V
ARG 1 scale
ARG 3 textureWidth
ARG 4 textureHeight
METHOD a setRotationAngles (FFFFFFLagf;)V
ARG 1 limbMoveAngle
ARG 2 limbMoveAmount
@ -33,4 +34,5 @@ CLASS cwa net/minecraft/client/render/entity/model/BipedEntityModel
ARG 2 swingAmount
ARG 3 swingDelta
METHOD a setAttributes (Lcwk;)V
ARG 1 model
METHOD a setVisible (Z)V

26
mappings/net/minecraft/client/render/entity/model/BoxEntityModel.mapping
View File

@ -1,26 +0,0 @@
CLASS cyg net/minecraft/client/render/entity/model/BoxEntityModel
FIELD a textureWidth F
FIELD b textureHeight F
FIELD c rotationPointX F
FIELD d rotationPointY F
FIELD e rotationPointZ F
FIELD f pitch F
FIELD g yaw F
FIELD h roll F
FIELD i mirror Z
FIELD j visible Z
FIELD m children Ljava/util/List;
FIELD v owner Lcwk;
METHOD <init> (Lcwk;II)V
ARG 1 owner
METHOD <init> (Lcwk;Ljava/lang/String;)V
ARG 1 owner
METHOD a render (F)V
METHOD a setRotationPoint (FFF)V
ARG 1 x
ARG 2 y
METHOD a addBox (FFFIIIF)V
METHOD a addChild (Lcyg;)V
METHOD a add (Ljava/lang/String;FFFIIIF)Lcyg;
METHOD b setTextureSize (II)Lcyg;
ARG 1 width

2
mappings/cvl.mapping → mappings/net/minecraft/client/render/entity/model/CatEntityModel.mapping
View File

@ -1,4 +1,4 @@
CLASS cvl
CLASS cvl net/minecraft/client/render/entity/model/CatEntityModel
METHOD a setRotationAngles (FFFFFFLagf;)V
ARG 1 limbMoveAngle
ARG 2 limbMoveAmount

1
mappings/net/minecraft/client/render/entity/model/ZombieEntityModel.mapping
View File

@ -2,6 +2,7 @@ CLASS cxz net/minecraft/client/render/entity/model/ZombieEntityModel
METHOD <init> (FFII)V
ARG 1 scale
ARG 3 textureWidth
ARG 4 textureHeight
METHOD a setRotationAngles (FFFFFFLagf;)V
ARG 1 limbMoveAngle
ARG 2 limbMoveAmount

4
mappings/cu.mapping → mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping
View File

@ -1,10 +1,12 @@
CLASS cu
CLASS cu net/minecraft/command/arguments/NumberRangeArgumentType
CLASS cu$a FloatRangeArgumentType
CLASS cu$a$a
METHOD b fromPacket (Liq;)Lcom/mojang/brigadier/arguments/ArgumentType;
FIELD a EXAMPLES Ljava/util/Collection;
CLASS cu$b IntRangeArgumentType
CLASS cu$b$a
METHOD b fromPacket (Liq;)Lcom/mojang/brigadier/arguments/ArgumentType;
FIELD a EXAMPLES Ljava/util/Collection;
CLASS cu$c
METHOD a toJson (Lcom/mojang/brigadier/arguments/ArgumentType;Lcom/google/gson/JsonObject;)V
METHOD a toPacket (Lcom/mojang/brigadier/arguments/ArgumentType;Liq;)V

2
mappings/yn.mapping → mappings/net/minecraft/util/ProgressListener.mapping
View File

@ -1,3 +1,3 @@
CLASS yn
CLASS yn net/minecraft/util/ProgressListener
METHOD a progressStagePercentage (I)V
ARG 1 i