From 9fc54472175f39021084cc22485f90317d663b3c Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Sun, 16 Oct 2016 00:05:38 -0600 Subject: [PATCH] More misc mappings (#118) * Mapped a few misc things related to entities and rendering. * Fixed a few things based on Copy's suggestions. * Fixed mainhand/offhand issue. --- .../client/render/FirstPersonRenderer.mapping | 51 +++++++++++++++++++ .../render/entity/EntityRendererBiped.mapping | 16 ++++++ .../entity/model/EntityModelVillager.mapping | 1 + .../entity/model/EntityModelWitch.mapping | 7 +++ .../entity/EntityWeatherEffect.mapping | 1 + .../entity/mob/EntityFlying.mapping} | 2 +- mappings/none/blp.mapping | 2 - mappings/none/btn.mapping | 5 -- 8 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 mappings/net/minecraft/client/render/FirstPersonRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/EntityRendererBiped.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/EntityModelWitch.mapping create mode 100644 mappings/net/minecraft/entity/EntityWeatherEffect.mapping rename mappings/{none/sn.mapping => net/minecraft/entity/mob/EntityFlying.mapping} (60%) delete mode 100644 mappings/none/blp.mapping delete mode 100644 mappings/none/btn.mapping diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping new file mode 100644 index 0000000000..2d8c338347 --- /dev/null +++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping @@ -0,0 +1,51 @@ +CLASS none/box net/minecraft/client/render/FirstPersonRenderer + FIELD a MAP_BACKGROUND_TEX Lnone/kp; + FIELD b UNDERWATER_TEX Lnone/kp; + FIELD c game Lnone/bdr; + FIELD d mainHand Lnone/aes; + FIELD e offHand Lnone/aes; + FIELD f equipProgressMainHand F + FIELD g prevEquipProgressMainHand F + FIELD h equipProgressOffHand F + FIELD i prevEquipProgressOffHand F + FIELD j renderManager Lnone/btd; + FIELD k itemRenderer Lnone/btr; + METHOD (Lnone/bdr;)V + ARG 0 minecraft + METHOD a updateHeldItems ()V + METHOD a renderFirstPersonItem (F)V + ARG 0 deltaTicks + METHOD a rotate (FF)V + ARG 0 degreeX + ARG 1 degreeY + METHOD a renderFirstPersonMap (FFF)V + METHOD a renderBlock (FLnone/bxe;)V + ARG 0 deltaTicks + ARG 1 atlas + METHOD a renderFirstPersonMap (Lnone/aes;)V + ARG 0 map + METHOD a isTranslucent (Lnone/aky;)Z + ARG 0 block + METHOD a renderFirstPersonItem (Lnone/boe;FFLnone/rb;FLnone/aes;F)V + ARG 0 player + ARG 3 hand + ARG 5 item + METHOD a resetEquipProgress (Lnone/rb;)V + ARG 0 hand + METHOD a renderArm (Lnone/so;)V + ARG 0 hand + METHOD a renderItem (Lnone/sp;Lnone/aes;Lnone/bqf$b;)V + ARG 0 holder + ARG 1 stack + ARG 2 transformation + METHOD a renderItemFromSide (Lnone/sp;Lnone/aes;Lnone/bqf$b;Z)V + ARG 0 holder + ARG 1 stack + ARG 2 transformation + METHOD b renderOverlays (F)V + ARG 0 deltaTicks + METHOD c renderArms ()V + METHOD e renderWaterOverlay (F)V + ARG 0 deltaTicks + METHOD f renderFireOverlay (F)V + ARG 0 deltaTicks diff --git a/mappings/net/minecraft/client/render/entity/EntityRendererBiped.mapping b/mappings/net/minecraft/client/render/entity/EntityRendererBiped.mapping new file mode 100644 index 0000000000..60ddb0e49f --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/EntityRendererBiped.mapping @@ -0,0 +1,16 @@ +CLASS none/btn net/minecraft/client/render/entity/EntityRendererBiped + FIELD a model Lnone/bkj; + FIELD b scale F + FIELD k SKIN Lnone/kp; + METHOD (Lnone/btd;Lnone/bkj;F)V + ARG 0 renderManager + ARG 1 model + ARG 2 shadowSize + METHOD (Lnone/btd;Lnone/bkj;FF)V + ARG 0 renderManager + ARG 1 model + ARG 2 shadowSize + METHOD a getTexture (Lnone/sg;)Lnone/kp; + ARG 0 model + METHOD a getTexture (Lnone/sq;)Lnone/kp; + ARG 0 model diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelVillager.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelVillager.mapping index 07874bc415..579a6738bd 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelVillager.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelVillager.mapping @@ -1,4 +1,5 @@ CLASS none/bln net/minecraft/client/render/entity/model/EntityModelVillager + FIELD f nose Lnone/blz; METHOD a setRotationAngles (FFFFFFLnone/sg;)V METHOD a render (Lnone/sg;FFFFFF)V ARG 0 entity diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelWitch.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelWitch.mapping new file mode 100644 index 0000000000..a0743fae98 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelWitch.mapping @@ -0,0 +1,7 @@ +CLASS none/blp net/minecraft/client/render/entity/model/EntityModelWitch + FIELD g hasItem Z + FIELD h mole Lnone/blz; + FIELD i hat Lnone/blz; + METHOD (F)V + ARG 0 scale + METHOD a setRotationAngles (FFFFFFLnone/sg;)V diff --git a/mappings/net/minecraft/entity/EntityWeatherEffect.mapping b/mappings/net/minecraft/entity/EntityWeatherEffect.mapping new file mode 100644 index 0000000000..c8c1ee90d8 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityWeatherEffect.mapping @@ -0,0 +1 @@ +CLASS none/yw net/minecraft/entity/EntityWeatherEffect diff --git a/mappings/none/sn.mapping b/mappings/net/minecraft/entity/mob/EntityFlying.mapping similarity index 60% rename from mappings/none/sn.mapping rename to mappings/net/minecraft/entity/mob/EntityFlying.mapping index 315f2e200d..df35bc1842 100644 --- a/mappings/none/sn.mapping +++ b/mappings/net/minecraft/entity/mob/EntityFlying.mapping @@ -1,4 +1,4 @@ -CLASS none/sn +CLASS none/sn net/minecraft/entity/mob/EntityFlying METHOD e handleFallDamage (FF)V ARG 0 fallDistance METHOD m_ canClimb ()Z diff --git a/mappings/none/blp.mapping b/mappings/none/blp.mapping deleted file mode 100644 index d83e8971d2..0000000000 --- a/mappings/none/blp.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/blp - METHOD a setRotationAngles (FFFFFFLnone/sg;)V diff --git a/mappings/none/btn.mapping b/mappings/none/btn.mapping deleted file mode 100644 index 3f7d6eee1a..0000000000 --- a/mappings/none/btn.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS none/btn - METHOD a getTexture (Lnone/sg;)Lnone/kp; - ARG 0 model - METHOD a getTexture (Lnone/sq;)Lnone/kp; - ARG 0 model