Skip to content

Commit

Permalink
tweak model renderer-related class naming, move some things around (F…
Browse files Browse the repository at this point in the history 
…abricMC#345)
  • Loading branch information
@asiekierka
asiekierka authored Dec 20, 2018
1 parent 60a2f5b commit afd4b9c
Show file tree
Hide file tree
Showing 21 changed files with 143 additions and 135 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BedBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ CLASS bgo net/minecraft/block/BedBlock
ARG 2 world
ARG 3 pos
ARG 4 newState
METHOD a getPosRandom (Lbpm;Let;)J
METHOD a getRenderingSeed (Lbpm;Let;)J
ARG 1 state
ARG 2 pos
METHOD a getStateForNeighborUpdate (Lbpm;Ley;Lbpm;Lbbq;Let;Let;)Lbpm;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/Block.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ CLASS bgs net/minecraft/block/Block
METHOD a getDroppedStacks (Lbpm;Lciv$a;)Ljava/util/List;
ARG 1 state
ARG 2 builder
METHOD a getPosRandom (Lbpm;Let;)J
METHOD a getRenderingSeed (Lbpm;Let;)J
ARG 1 state
ARG 2 pos
METHOD a getStateForNeighborUpdate (Lbpm;Ley;Lbpm;Lbbq;Let;Let;)Lbpm;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/BlockRenderType.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS bky net/minecraft/block/BlockRenderType
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/BlockState.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ CLASS bpm net/minecraft/block/BlockState
METHOD a serialize (Lcom/mojang/datafixers/types/DynamicOps;Lbpm;)Lcom/mojang/datafixers/Dynamic;
ARG 0 ops
ARG 1 state
METHOD a getPosRandom (Let;)J
METHOD a getRenderingSeed (Let;)J
ARG 1 pos
METHOD a getStateForNeighborUpdate (Ley;Lbpm;Lbbq;Let;Let;)Lbpm;
ARG 1 facing
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/DoorBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CLASS bib net/minecraft/block/DoorBlock
METHOD a applyRotation (Lbpm;Lblb;)Lbpm;
ARG 1 state
ARG 2 rotation
METHOD a getPosRandom (Lbpm;Let;)J
METHOD a getRenderingSeed (Lbpm;Let;)J
ARG 1 state
ARG 2 pos
METHOD a getStateForNeighborUpdate (Lbpm;Ley;Lbpm;Lbbq;Let;Let;)Lbpm;
Expand Down
3 changes: 0 additions & 3 deletions mappings/net/minecraft/block/RenderTypeBlock.mapping
View file

This file was deleted.

2 changes: 1 addition & 1 deletion mappings/net/minecraft/block/TallPlantBlock.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CLASS bic net/minecraft/block/TallPlantBlock
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD a getPosRandom (Lbpm;Let;)J
METHOD a getRenderingSeed (Lbpm;Let;)J
ARG 1 state
ARG 2 pos
METHOD a getStateForNeighborUpdate (Lbpm;Ley;Lbpm;Lbbq;Let;Let;)Lbpm;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/BedBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS bnn net/minecraft/block/entity/BedBlockEntity
METHOD a renderItem (Lavl;)V
METHOD ai_ toUpdatePacket ()Lke;
5 changes: 0 additions & 5 deletions mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping
View file

This file was deleted.

111 changes: 108 additions & 3 deletions mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,108 @@
CLASS des net/minecraft/client/render/block/BlockModelRenderer
METHOD a renderBlockModel (Lbgs;F)V
ARG 1 block
CLASS dew net/minecraft/client/render/block/BlockModelRenderer
CLASS dew$a NeighborData
FIELD a DOWN Ldew$a;
FIELD b UP Ldew$a;
FIELD c NORTH Ldew$a;
FIELD d SOUTH Ldew$a;
FIELD e WEST Ldew$a;
FIELD f EAST Ldew$a;
FIELD g faces [Ley;
FIELD h nonCubicWeight Z
METHOD a getData (Ley;)Ldew$a;
CLASS dew$b AmbientOcclusionCalculator
FIELD b colorMultiplier [F
FIELD c brightness [I
METHOD a getAmbientOcclusionBrightness (IIII)I
METHOD a getBrightness (IIIIFFFF)I
METHOD a apply (Lbaz;Lbpm;Let;Ley;[FLjava/util/BitSet;)V
CLASS dew$c Translation
FIELD a DOWN Ldew$c;
FIELD b UP Ldew$c;
FIELD c NORTH Ldew$c;
FIELD d SOUTH Ldew$c;
FIELD e WEST Ldew$c;
FIELD f EAST Ldew$c;
FIELD g firstCorner I
FIELD h secondCorner I
FIELD i thirdCorner I
FIELD j fourthCorner I
FIELD k VALUES [Ldew$c;
METHOD a getTranslations (Ley;)Ldew$c;
CLASS dew$d NeighborOrientation
FIELD a DOWN Ldew$d;
FIELD b UP Ldew$d;
FIELD c NORTH Ldew$d;
FIELD d SOUTH Ldew$d;
FIELD e WEST Ldew$d;
FIELD f EAST Ldew$d;
FIELD g FLIP_DOWN Ldew$d;
FIELD h FLIP_UP Ldew$d;
FIELD i FLIP_NORTH Ldew$d;
FIELD j FLIP_SOUTH Ldew$d;
FIELD k FLIP_WEST Ldew$d;
FIELD l FLIP_EAST Ldew$d;
FIELD m shape I
FIELD a colorMap Lcpt;
METHOD a renderQuad (FFFFLjava/util/List;)V
ARG 1 colorMultiplier
ARG 2 red
ARG 3 green
ARG 4 blue
METHOD a tesselateQuadsFlat (Lbaz;Lbpm;Let;IZLcou;Ljava/util/List;Ljava/util/BitSet;)V
ARG 1 view
ARG 2 state
ARG 3 pos
ARG 4 brightness
ARG 5 checkBrightness
ARG 6 buffer
ARG 7 quads
METHOD a tesselateQuadsSmooth (Lbaz;Lbpm;Let;Lcou;Ljava/util/List;[FLjava/util/BitSet;Ldew$b;)V
ARG 1 view
ARG 2 state
ARG 3 pos
ARG 4 buffer
ARG 5 quads
ARG 6 faceShape
ARG 7 shapeState
METHOD a updateShape (Lbaz;Lbpm;Let;[ILey;[FLjava/util/BitSet;)V
ARG 3 state
ARG 4 vertexData
ARG 5 facing
ARG 6 faceShape
METHOD a tesselate (Lbaz;Ldoy;Lbpm;Let;Lcou;ZLjava/util/Random;J)Z
ARG 1 view
ARG 2 model
ARG 3 state
ARG 4 pos
ARG 5 buffer
ARG 6 testSides
METHOD a render (Lbpm;Ldoy;FFFF)V
ARG 1 state
ARG 2 model
ARG 3 colorMultiplier
ARG 4 red
ARG 5 green
METHOD a render (Ldoy;FFFF)V
ARG 1 model
ARG 2 colorMultiplier
ARG 3 red
ARG 4 green
METHOD a render (Ldoy;Lbpm;FZ)V
ARG 1 model
ARG 2 state
ARG 3 colorMultiplier
METHOD b tesselateSmooth (Lbaz;Ldoy;Lbpm;Let;Lcou;ZLjava/util/Random;J)Z
ARG 1 view
ARG 2 model
ARG 3 state
ARG 4 pos
ARG 5 buffer
ARG 6 testSides
METHOD c tesselateFlat (Lbaz;Ldoy;Lbpm;Let;Lcou;ZLjava/util/Random;J)Z
ARG 1 view
ARG 2 model
ARG 3 state
ARG 4 pos
ARG 5 buffer
ARG 6 testSides
ARG 8 seed
9 changes: 5 additions & 4 deletions mappings/net/minecraft/client/render/block/BlockRenderManager.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
CLASS deu net/minecraft/client/render/block/BlockRenderManager
FIELD a models Ldet;
FIELD b renderer Ldew;
FIELD c modelRenderer Ldes;
FIELD d liquidRenderer Ldev;
FIELD c dynamicRenderer Ldes;
FIELD d fluidRenderer Ldev;
FIELD e random Ljava/util/Random;
METHOD <init> (Ldet;Lcpt;)V
ARG 1 models
METHOD a getModels ()Ldet;
METHOD a getModel (Lbpm;)Ldoy;
ARG 1 state
METHOD a render (Lbpm;F)V
METHOD a renderDynamic (Lbpm;F)V
ARG 1 state
ARG 2 delta
METHOD a tesselateBlock (Lbpm;Let;Lbaz;Lcou;Ljava/util/Random;)Z
METHOD a tesselateDamage (Lbpm;Let;Ldno;Lbaz;)V
ARG 1 state
ARG 2 pos
METHOD a tesselateFluid (Let;Lbaz;Lcou;Lcfd;)Z
METHOD a onResourceReload (Lwj;)V
ARG 1 manager
METHOD b getRenderer ()Ldew;
METHOD b getModelRenderer ()Ldew;
107 changes: 0 additions & 107 deletions mappings/net/minecraft/client/render/block/BlockRenderer.mapping
View file

This file was deleted.

3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/render/block/DynamicBlockRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS des net/minecraft/client/render/block/DynamicBlockRenderer
METHOD a render (Lbgs;F)V
ARG 1 block
6 changes: 6 additions & 0 deletions mappings/net/minecraft/client/render/block/FluidRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS dev net/minecraft/client/render/block/FluidRenderer
FIELD a lavaSprites [Ldno;
FIELD b waterSprites [Ldno;
FIELD c waterOverlaySprite Ldno;
METHOD a onResourceReload ()V
METHOD a tesselate (Lbaz;Let;Lcou;Lcfd;)Z
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/entity/model/ShieldEntityModel.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CLASS czu net/minecraft/client/render/entity/model/ShieldEntityModel
METHOD a renderItem ()V
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/entity/model/TridentEntityModel.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS daf net/minecraft/client/render/entity/model/TridentEntityModel
FIELD a TEXTURE Lqc;
METHOD a renderItem ()V
3 changes: 2 additions & 1 deletion ...t/render/item/ItemBuiltinRenderer.mapping → ...t/render/item/ItemDynamicRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS ddx net/minecraft/client/render/item/ItemBuiltinRenderer
CLASS ddx net/minecraft/client/render/item/ItemDynamicRenderer
FIELD a INSTANCE Lddx;
FIELD b RENDER_SHULKER_BOX_DYED [Lbol;
FIELD c RENDER_SHULKER_BOX Lbol;
Expand All @@ -11,4 +11,5 @@ CLASS ddx net/minecraft/client/render/item/ItemBuiltinRenderer
FIELD j renderConduit Lbnw;
FIELD k modelShield Lczu;
FIELD l modelTrident Ldaf;
METHOD a render (Lawo;)V
METHOD a applyEnchantmentGlow (Ljava/lang/Runnable;)V
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/ItemRenderer.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS djo net/minecraft/client/render/item/ItemRenderer
FIELD a ENCHANTMENT_GLINT_TEX Lqc;
FIELD b zOffset F
FIELD c WITHOUT_MODELS Ljava/util/Set;
FIELD d modelMap Lded;
FIELD e textureManager Ldnp;
FIELD f colorMap Lcpw;
Expand Down
5 changes: 0 additions & 5 deletions mappings/net/minecraft/client/sortme/ChatMessageType.mapping
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...ecraft/client/sortme/NetworkUtils.mapping → ...inecraft/client/util/NetworkUtils.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS yq net/minecraft/client/sortme/NetworkUtils
CLASS yq net/minecraft/client/util/NetworkUtils
FIELD a downloadExecutor Lcom/google/common/util/concurrent/ListeningExecutorService;
FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
METHOD a choosePort ()I
METHOD a findLocalPort ()I
METHOD a download (Ljava/io/File;Ljava/lang/String;Ljava/util/Map;ILyx;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture;
7 changes: 7 additions & 0 deletions mappings/net/minecraft/sortme/ChatMessageType.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS jb net/minecraft/sortme/ChatMessageType
FIELD d id B
METHOD <init> (Ljava/lang/String;IB)V
ARG 3 id
METHOD a getId ()B
METHOD a byId (B)Ljb;
ARG 0 id

0 comments on commit afd4b9c

Please sign in to comment.