diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 83f40f65bf..ad0712e7ce 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -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; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 1ef65dee87..50c0332046 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -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; diff --git a/mappings/net/minecraft/block/BlockRenderType.mapping b/mappings/net/minecraft/block/BlockRenderType.mapping new file mode 100644 index 0000000000..a083e5ef17 --- /dev/null +++ b/mappings/net/minecraft/block/BlockRenderType.mapping @@ -0,0 +1 @@ +CLASS bky net/minecraft/block/BlockRenderType diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 4a03393763..4b0421ec62 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -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 diff --git a/mappings/net/minecraft/block/DoorBlock.mapping b/mappings/net/minecraft/block/DoorBlock.mapping index b02ff1dfae..c26569728a 100644 --- a/mappings/net/minecraft/block/DoorBlock.mapping +++ b/mappings/net/minecraft/block/DoorBlock.mapping @@ -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; diff --git a/mappings/net/minecraft/block/RenderTypeBlock.mapping b/mappings/net/minecraft/block/RenderTypeBlock.mapping deleted file mode 100644 index 5f8224e2d1..0000000000 --- a/mappings/net/minecraft/block/RenderTypeBlock.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS bky net/minecraft/block/RenderTypeBlock - FIELD a NONE Lbky; - FIELD c MODEL Lbky; diff --git a/mappings/net/minecraft/block/TallPlantBlock.mapping b/mappings/net/minecraft/block/TallPlantBlock.mapping index ea9fb9cffd..3d057d7e37 100644 --- a/mappings/net/minecraft/block/TallPlantBlock.mapping +++ b/mappings/net/minecraft/block/TallPlantBlock.mapping @@ -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; diff --git a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping index 8188db93ef..f80a20166d 100644 --- a/mappings/net/minecraft/block/entity/BedBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BedBlockEntity.mapping @@ -1,2 +1,3 @@ CLASS bnn net/minecraft/block/entity/BedBlockEntity + METHOD a renderItem (Lavl;)V METHOD ai_ toUpdatePacket ()Lke; diff --git a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping deleted file mode 100644 index 53f316cbd8..0000000000 --- a/mappings/net/minecraft/client/render/block/BlockLiquidRenderer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS dev net/minecraft/client/render/block/BlockLiquidRenderer - FIELD a lavaSprite [Ldno; - FIELD b waterSprite [Ldno; - FIELD c waterOverlaySprite Ldno; - METHOD a onResourceReload ()V diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index cb9db8a676..040e5777ed 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index fb3a48c10b..5839c199a7 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -1,16 +1,17 @@ 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 (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 @@ -18,4 +19,4 @@ CLASS deu net/minecraft/client/render/block/BlockRenderManager METHOD a tesselateFluid (Let;Lbaz;Lcou;Lcfd;)Z METHOD a onResourceReload (Lwj;)V ARG 1 manager - METHOD b getRenderer ()Ldew; + METHOD b getModelRenderer ()Ldew; diff --git a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockRenderer.mapping deleted file mode 100644 index f7b03659f3..0000000000 --- a/mappings/net/minecraft/client/render/block/BlockRenderer.mapping +++ /dev/null @@ -1,107 +0,0 @@ -CLASS dew net/minecraft/client/render/block/BlockRenderer - 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 diff --git a/mappings/net/minecraft/client/render/block/DynamicBlockRenderer.mapping b/mappings/net/minecraft/client/render/block/DynamicBlockRenderer.mapping new file mode 100644 index 0000000000..cca20060e5 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/DynamicBlockRenderer.mapping @@ -0,0 +1,3 @@ +CLASS des net/minecraft/client/render/block/DynamicBlockRenderer + METHOD a render (Lbgs;F)V + ARG 1 block diff --git a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping new file mode 100644 index 0000000000..219ec8f8ae --- /dev/null +++ b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping @@ -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 diff --git a/mappings/net/minecraft/client/render/entity/model/ShieldEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ShieldEntityModel.mapping index ae802d9f97..81075c7063 100644 --- a/mappings/net/minecraft/client/render/entity/model/ShieldEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ShieldEntityModel.mapping @@ -1 +1,2 @@ CLASS czu net/minecraft/client/render/entity/model/ShieldEntityModel + METHOD a renderItem ()V diff --git a/mappings/net/minecraft/client/render/entity/model/TridentEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/TridentEntityModel.mapping index b6fa1eb03c..0e5f942003 100644 --- a/mappings/net/minecraft/client/render/entity/model/TridentEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/TridentEntityModel.mapping @@ -1,2 +1,3 @@ CLASS daf net/minecraft/client/render/entity/model/TridentEntityModel FIELD a TEXTURE Lqc; + METHOD a renderItem ()V diff --git a/mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping similarity index 82% rename from mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping rename to mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping index fa4fa0fdfe..efae17ac0d 100644 --- a/mappings/net/minecraft/client/render/item/ItemBuiltinRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemDynamicRenderer.mapping @@ -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; @@ -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 diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 68ddffc430..f50c024057 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -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; diff --git a/mappings/net/minecraft/client/sortme/ChatMessageType.mapping b/mappings/net/minecraft/client/sortme/ChatMessageType.mapping deleted file mode 100644 index 9ca41d3bc9..0000000000 --- a/mappings/net/minecraft/client/sortme/ChatMessageType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS jb net/minecraft/client/sortme/ChatMessageType - FIELD d id B - METHOD a getId ()B - METHOD a byId (B)Ljb; - ARG 0 id diff --git a/mappings/net/minecraft/client/sortme/NetworkUtils.mapping b/mappings/net/minecraft/client/util/NetworkUtils.mapping similarity index 77% rename from mappings/net/minecraft/client/sortme/NetworkUtils.mapping rename to mappings/net/minecraft/client/util/NetworkUtils.mapping index cfe78f9572..e1065fd244 100644 --- a/mappings/net/minecraft/client/sortme/NetworkUtils.mapping +++ b/mappings/net/minecraft/client/util/NetworkUtils.mapping @@ -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; diff --git a/mappings/net/minecraft/sortme/ChatMessageType.mapping b/mappings/net/minecraft/sortme/ChatMessageType.mapping new file mode 100644 index 0000000000..4ea27fe970 --- /dev/null +++ b/mappings/net/minecraft/sortme/ChatMessageType.mapping @@ -0,0 +1,7 @@ +CLASS jb net/minecraft/sortme/ChatMessageType + FIELD d id B + METHOD (Ljava/lang/String;IB)V + ARG 3 id + METHOD a getId ()B + METHOD a byId (B)Ljb; + ARG 0 id