From 3abd72da617491078330c4452735215190e32734 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sat, 18 May 2019 13:23:23 +0200 Subject: [PATCH] Various entity renderer & model mappings (#707) --- .../client/render/entity/FoxEntityRenderer.mapping | 6 +++--- .../client/render/entity/IllagerBeastEntityRenderer.mapping | 2 -- .../client/render/entity/RavagerEntityRenderer.mapping | 2 ++ .../client/render/entity/TNTPrimedEntityRenderer.mapping | 1 - .../client/render/entity/TntEntityRenderer.mapping | 1 + .../render/entity/feature/CatCollarFeatureRenderer.mapping | 2 ++ .../entity/feature/CreeperChargeFeatureRenderer.mapping | 1 + .../entity/feature/DrownedOverlayFeatureRenderer.mapping | 2 ++ .../entity/feature/PhantomEyesFeatureRenderer.mapping | 1 + .../render/entity/feature/PigSaddleFeatureRenderer.mapping | 1 + .../render/entity/feature/SheepWoolFeatureRenderer.mapping | 1 + .../entity/feature/ShoulderParrotFeatureRenderer.mapping | 1 + .../entity/feature/TridentRiptideFeatureRenderer.mapping | 2 ++ .../feature/TropicalFishSomethingFeatureRenderer.mapping | 2 ++ .../entity/feature/WitherArmorFeatureRenderer.mapping | 1 + .../render/entity/model/ChestDoubleEntityModel.mapping | 1 - .../model/{FoxModel.mapping => FoxEntityModel.mapping} | 2 +- .../render/entity/model/IllagerBeastEntityModel.mapping | 1 - .../render/entity/model/LargeChestEntityModel.mapping | 1 + .../client/render/entity/model/PhantomEntityModel.mapping | 1 + .../client/render/entity/model/RavagerEntityModel.mapping | 1 + .../entity/{PrimedTntEntity.mapping => TntEntity.mapping} | 2 +- 22 files changed, 25 insertions(+), 10 deletions(-) delete mode 100644 mappings/net/minecraft/client/render/entity/IllagerBeastEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/RavagerEntityRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/TNTPrimedEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/entity/model/ChestDoubleEntityModel.mapping rename mappings/net/minecraft/client/render/entity/model/{FoxModel.mapping => FoxEntityModel.mapping} (78%) delete mode 100644 mappings/net/minecraft/client/render/entity/model/IllagerBeastEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/RavagerEntityModel.mapping rename mappings/net/minecraft/entity/{PrimedTntEntity.mapping => TntEntity.mapping} (86%) diff --git a/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping index 423083446a..a461a0b292 100644 --- a/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FoxEntityRenderer.mapping @@ -1,5 +1,5 @@ CLASS dpq net/minecraft/client/render/entity/FoxEntityRenderer FIELD a SKIN Lqs; - FIELD j SKIN_SLEEP Lqs; - FIELD k SKIN_SNOW Lqs; - FIELD l SKIN_SNOW_SLEEp Lqs; + FIELD j SLEEPING_SKIN Lqs; + FIELD k SNOW_SKIN Lqs; + FIELD l SLEEPING_SNOW_SKIN Lqs; diff --git a/mappings/net/minecraft/client/render/entity/IllagerBeastEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/IllagerBeastEntityRenderer.mapping deleted file mode 100644 index c40faa9ca4..0000000000 --- a/mappings/net/minecraft/client/render/entity/IllagerBeastEntityRenderer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dqy net/minecraft/client/render/entity/IllagerBeastEntityRenderer - FIELD a SKIN Lqs; diff --git a/mappings/net/minecraft/client/render/entity/RavagerEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/RavagerEntityRenderer.mapping new file mode 100644 index 0000000000..4bcb99d210 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/RavagerEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS dqy net/minecraft/client/render/entity/RavagerEntityRenderer + FIELD a SKIN Lqs; diff --git a/mappings/net/minecraft/client/render/entity/TNTPrimedEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TNTPrimedEntityRenderer.mapping deleted file mode 100644 index a6012e298f..0000000000 --- a/mappings/net/minecraft/client/render/entity/TNTPrimedEntityRenderer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS drq net/minecraft/client/render/entity/TNTPrimedEntityRenderer diff --git a/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping new file mode 100644 index 0000000000..61587d060b --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/TntEntityRenderer.mapping @@ -0,0 +1 @@ +CLASS drq net/minecraft/client/render/entity/TntEntityRenderer diff --git a/mappings/net/minecraft/client/render/entity/feature/CatCollarFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/CatCollarFeatureRenderer.mapping index d4bef0d710..b94a40b019 100644 --- a/mappings/net/minecraft/client/render/entity/feature/CatCollarFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/CatCollarFeatureRenderer.mapping @@ -1,3 +1,5 @@ CLASS dsl net/minecraft/client/render/entity/feature/CatCollarFeatureRenderer + FIELD a SKIN Lqs; + FIELD b model Ldee; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/CreeperChargeFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/CreeperChargeFeatureRenderer.mapping index 606d283f1a..a182f68a5e 100644 --- a/mappings/net/minecraft/client/render/entity/feature/CreeperChargeFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/CreeperChargeFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dsm net/minecraft/client/render/entity/feature/CreeperChargeFeatureRenderer FIELD a SKIN Lqs; + FIELD b model Ldek; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/DrownedOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/DrownedOverlayFeatureRenderer.mapping index fb977fd81b..903f007046 100644 --- a/mappings/net/minecraft/client/render/entity/feature/DrownedOverlayFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/DrownedOverlayFeatureRenderer.mapping @@ -1,3 +1,5 @@ CLASS dsq net/minecraft/client/render/entity/feature/DrownedOverlayFeatureRenderer + FIELD a SKIN Lqs; + FIELD b model Ldel; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/PhantomEyesFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PhantomEyesFeatureRenderer.mapping index e801c77458..7b3d5e1689 100644 --- a/mappings/net/minecraft/client/render/entity/feature/PhantomEyesFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/PhantomEyesFeatureRenderer.mapping @@ -1,3 +1,4 @@ CLASS dte net/minecraft/client/render/entity/feature/PhantomEyesFeatureRenderer + FIELD a SKIN Lqs; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping index 589124ba96..66a4dda89d 100644 --- a/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dtf net/minecraft/client/render/entity/feature/PigSaddleFeatureRenderer FIELD a SKIN Lqs; + FIELD b model Ldfl; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.mapping index 6b518ebe02..09f8e6e255 100644 --- a/mappings/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dth net/minecraft/client/render/entity/feature/SheepWoolFeatureRenderer FIELD a SKIN Lqs; + FIELD b model Ldfx; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping index c6bb66b3da..665413268d 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dtd net/minecraft/client/render/entity/feature/ShoulderParrotFeatureRenderer + FIELD a model Ldfj; METHOD (Ldqz;)V ARG 1 context METHOD a renderShoulderParrot (Lavy;FFFFFFZ)V diff --git a/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping index f9ae762a05..1c5ff6fe15 100644 --- a/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping @@ -1,4 +1,6 @@ CLASS dtm net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer + CLASS dtm$a TridentRiptideModel FIELD a TEXTURE Lqs; + FIELD b model Ldtm$a; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping index 6961c5d77e..b49b348201 100644 --- a/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer.mapping @@ -1,3 +1,5 @@ CLASS dto net/minecraft/client/render/entity/feature/TropicalFishSomethingFeatureRenderer + FIELD a modelA Ldgl; + FIELD b modelB Ldgm; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/WitherArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/WitherArmorFeatureRenderer.mapping index 00519f3925..2cecbd1284 100644 --- a/mappings/net/minecraft/client/render/entity/feature/WitherArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/WitherArmorFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dtr net/minecraft/client/render/entity/feature/WitherArmorFeatureRenderer FIELD a SKIN Lqs; + FIELD b model Ldgt; METHOD (Ldqz;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/model/ChestDoubleEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChestDoubleEntityModel.mapping deleted file mode 100644 index 340de66907..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/ChestDoubleEntityModel.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS dfa net/minecraft/client/render/entity/model/ChestDoubleEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/FoxModel.mapping b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping similarity index 78% rename from mappings/net/minecraft/client/render/entity/model/FoxModel.mapping rename to mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping index de619172d0..41a515fa09 100644 --- a/mappings/net/minecraft/client/render/entity/model/FoxModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/FoxEntityModel.mapping @@ -1,4 +1,4 @@ -CLASS der net/minecraft/client/render/entity/model/FoxModel +CLASS der net/minecraft/client/render/entity/model/FoxEntityModel FIELD a head Ldhd; FIELD b leftEar Ldhd; FIELD f rightEar Ldhd; diff --git a/mappings/net/minecraft/client/render/entity/model/IllagerBeastEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/IllagerBeastEntityModel.mapping deleted file mode 100644 index fbff6f6210..0000000000 --- a/mappings/net/minecraft/client/render/entity/model/IllagerBeastEntityModel.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS dfv net/minecraft/client/render/entity/model/IllagerBeastEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping new file mode 100644 index 0000000000..cf99e92bfc --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/LargeChestEntityModel.mapping @@ -0,0 +1 @@ +CLASS dfa net/minecraft/client/render/entity/model/LargeChestEntityModel diff --git a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping index 115c25d71b..2095a874e4 100644 --- a/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PhantomEntityModel.mapping @@ -1 +1,2 @@ CLASS dfk net/minecraft/client/render/entity/model/PhantomEntityModel + FIELD a head Ldhd; diff --git a/mappings/net/minecraft/client/render/entity/model/RavagerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/RavagerEntityModel.mapping new file mode 100644 index 0000000000..68e939d9ea --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/RavagerEntityModel.mapping @@ -0,0 +1 @@ +CLASS dfv net/minecraft/client/render/entity/model/RavagerEntityModel diff --git a/mappings/net/minecraft/entity/PrimedTntEntity.mapping b/mappings/net/minecraft/entity/TntEntity.mapping similarity index 86% rename from mappings/net/minecraft/entity/PrimedTntEntity.mapping rename to mappings/net/minecraft/entity/TntEntity.mapping index a4f0c5000b..4a2f838f4f 100644 --- a/mappings/net/minecraft/entity/PrimedTntEntity.mapping +++ b/mappings/net/minecraft/entity/TntEntity.mapping @@ -1,4 +1,4 @@ -CLASS atq net/minecraft/entity/PrimedTntEntity +CLASS atq net/minecraft/entity/TntEntity FIELD b FUSE Lqh; FIELD c causingEntity Lair; FIELD d fuseTimer I