From 7a3b5e7c300d884b8851776734de2d298a26b1f8 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Thu, 31 Dec 2020 15:23:15 +0100 Subject: [PATCH] Beacon beam rendering and other be renderers (#1944) * Beacon beam rendering and other be renderers * missing parameters * follow conventions --- .../minecraft/client/MinecraftClient.mapping | 1 + .../entity/BannerBlockEntityRenderer.mapping | 2 + .../entity/BeaconBlockEntityRenderer.mapping | 78 ++++++++++++++++++- .../entity/BedBlockEntityRenderer.mapping | 2 + .../entity/BellBlockEntityRenderer.mapping | 3 + .../CampfireBlockEntityRenderer.mapping | 2 + .../entity/ChestBlockEntityRenderer.mapping | 2 + .../entity/ConduitBlockEntityRenderer.mapping | 3 + ...EnchantingTableBlockEntityRenderer.mapping | 2 + .../EndPortalBlockEntityRenderer.mapping | 3 + .../entity/LecternBlockEntityRenderer.mapping | 2 + .../MobSpawnerBlockEntityRenderer.mapping | 2 + .../entity/PistonBlockEntityRenderer.mapping | 2 + .../ShulkerBoxBlockEntityRenderer.mapping | 2 + .../entity/SignBlockEntityRenderer.mapping | 8 +- .../StructureBlockBlockEntityRenderer.mapping | 2 + mappings/net/minecraft/util/DyeColor.mapping | 3 + 17 files changed, 116 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 091c86d285..6fd3480bd6 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -358,6 +358,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_31320 getSocialInteractionsManager ()Lnet/minecraft/class_5520; METHOD method_31321 isConnectedToServer ()Z METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599; + METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824; CLASS class_5366 WorldLoadAction CLASS class_5367 IntegratedResourceManager FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283; diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 6def9bc029..54c8cdfc7e 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo FIELD field_20810 banner Lnet/minecraft/class_630; FIELD field_20811 pillar Lnet/minecraft/class_630; FIELD field_20812 crossbar Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLjava/util/List;Z)V ARG 0 matrices ARG 1 vertexConsumers diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping index b17602bf1b..ff005afe24 100644 --- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping @@ -1,4 +1,78 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer FIELD field_4338 BEAM_TEXTURE Lnet/minecraft/class_2960; - METHOD method_3543 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V - METHOD method_3545 renderLightBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2960;FFJII[FFF)V + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx + METHOD method_22740 renderBeamFace (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V + ARG 0 modelMatrix + ARG 1 normalMatrix + ARG 2 vertices + ARG 3 red + ARG 4 green + ARG 5 blue + ARG 6 alpha + ARG 7 yOffset + ARG 8 height + ARG 9 x1 + ARG 10 z1 + ARG 11 x2 + ARG 12 z2 + ARG 13 u1 + ARG 14 u2 + ARG 15 v1 + ARG 16 v2 + METHOD method_22741 renderBeamLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFIIFFFFFFFFFFFF)V + ARG 0 matrices + ARG 1 vertices + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha + ARG 6 yOffset + ARG 7 height + ARG 8 x1 + ARG 9 z1 + ARG 10 x2 + ARG 11 z2 + ARG 12 x3 + ARG 13 z3 + ARG 14 x4 + ARG 15 z4 + ARG 16 u1 + ARG 17 u2 + ARG 18 v1 + ARG 19 v2 + METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIFFFF)V + ARG 0 modelMatrix + ARG 1 normalMatrix + ARG 2 vertices + ARG 3 red + ARG 4 green + ARG 5 blue + ARG 6 alpha + ARG 7 y + ARG 8 x + ARG 9 z + ARG 10 u + COMMENT the left-most coordinate of the texture region + ARG 11 v + COMMENT the top-most coordinate of the texture region + METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 tickDelta + ARG 3 worldTime + ARG 5 yOffset + ARG 6 maxY + ARG 7 color + METHOD method_3545 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_2960;FFJII[FFF)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 textureId + ARG 3 tickDelta + ARG 4 heightScale + ARG 5 worldTime + ARG 7 yOffset + ARG 8 maxY + ARG 9 color + ARG 10 innerRadius + ARG 11 outerRadius diff --git a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping index 8e0de4eb34..2785df3678 100644 --- a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_825 net/minecraft/client/render/block/entity/BedBlockEntityRenderer + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_32136 getHeadTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_32137 getFootTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_3558 (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_630;Lnet/minecraft/class_2350;Lnet/minecraft/class_4730;IIZ)V diff --git a/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping index 9ef1dc2640..7b045727ad 100644 --- a/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BellBlockEntityRenderer.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3880 net/minecraft/client/render/block/entity/BellBlockEntityRenderer FIELD field_17145 BELL_BODY_TEXTURE Lnet/minecraft/class_4730; + FIELD field_20816 bellBody Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_32138 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/block/entity/CampfireBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/CampfireBlockEntityRenderer.mapping index 05f7350c4b..c2d726a38f 100644 --- a/mappings/net/minecraft/client/render/block/entity/CampfireBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/CampfireBlockEntityRenderer.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_3941 net/minecraft/client/render/block/entity/CampfireBlockEntityRenderer + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping index b2c327a6a6..7ffc169229 100644 --- a/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ChestBlockEntityRenderer.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_826 net/minecraft/client/render/block/entity/ChestBloc FIELD field_21480 doubleChestLeftBase Lnet/minecraft/class_630; FIELD field_21481 doubleChestLeftLatch Lnet/minecraft/class_630; FIELD field_4365 christmas Z + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_22749 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_630;Lnet/minecraft/class_630;Lnet/minecraft/class_630;FII)V ARG 1 matrices ARG 2 vertices diff --git a/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping index e4f9a8a7b9..5e83460a08 100644 --- a/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping @@ -1,10 +1,13 @@ CLASS net/minecraft/class_829 net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer + FIELD field_27753 dispatcher Lnet/minecraft/class_824; FIELD field_4371 WIND_VERTICAL_TEXTURE Lnet/minecraft/class_4730; FIELD field_4373 WIND_TEXTURE Lnet/minecraft/class_4730; FIELD field_4377 BASE_TEXTURE Lnet/minecraft/class_4730; FIELD field_4378 CAGE_TEXTURE Lnet/minecraft/class_4730; FIELD field_4379 OPEN_EYE_TEXTURE Lnet/minecraft/class_4730; FIELD field_4380 CLOSED_EYE_TEXTURE Lnet/minecraft/class_4730; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_32150 getEyeTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_32151 getWindTexturedModelData ()Lnet/minecraft/class_5607; METHOD method_32152 getShellTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.mapping index a49c1bfb22..2c3625d439 100644 --- a/mappings/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_828 net/minecraft/client/render/block/entity/EnchantingTableBlockEntityRenderer FIELD field_4369 BOOK_TEXTURE Lnet/minecraft/class_4730; FIELD field_4370 book Lnet/minecraft/class_557; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping index 068c551e1b..ea02f5b733 100644 --- a/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_840 net/minecraft/client/render/block/entity/EndPortalBlockEntityRenderer + FIELD field_27757 dispatcher Lnet/minecraft/class_824; FIELD field_4405 RANDOM Ljava/util/Random; FIELD field_4406 SKY_TEXTURE Lnet/minecraft/class_2960; FIELD field_4407 PORTAL_TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping index d743084923..4e4813351b 100644 --- a/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/LecternBlockEntityRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_3942 net/minecraft/client/render/block/entity/LecternBlockEntityRenderer FIELD field_17428 book Lnet/minecraft/class_557; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping index 85b5c6be87..a56ca0f12d 100644 --- a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_839 net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.mapping index 7f624d160c..65c48115dd 100644 --- a/mappings/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/PistonBlockEntityRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_835 net/minecraft/client/render/block/entity/PistonBlockEntityRenderer FIELD field_4389 manager Lnet/minecraft/class_776; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping index 16b48cae75..34099480f0 100644 --- a/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_834 net/minecraft/client/render/block/entity/ShulkerBoxBlockEntityRenderer FIELD field_4387 model Lnet/minecraft/class_602; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping index 194a392615..2343dcbe23 100644 --- a/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_837 net/minecraft/client/render/block/entity/SignBlockEntityRenderer + FIELD field_27755 textRenderer Lnet/minecraft/class_327; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx METHOD method_32154 getTexturedModelData ()Lnet/minecraft/class_5607; CLASS class_4702 SignModel - FIELD field_21531 foot Lnet/minecraft/class_630; + FIELD field_21531 stick Lnet/minecraft/class_630; + FIELD field_27756 root Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_630;)V + ARG 1 root diff --git a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping index 9e66fd0ed7..cb7d760eb0 100644 --- a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 ctx diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index f857e275a6..0ece2d1753 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -18,6 +18,9 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor METHOD method_7786 byFireworkColor (I)Lnet/minecraft/class_1767; ARG 0 color METHOD method_7787 getColorComponents ()[F + COMMENT Returns the red, blue and green components of this dye color. + COMMENT + COMMENT @return an array composed of the red, blue and green floats METHOD method_7789 getId ()I METHOD method_7790 getFireworkColor ()I METHOD method_7791 byId (I)Lnet/minecraft/class_1767;