From 32d2438975c28f0fd65c022c4f8daed29c91d374 Mon Sep 17 00:00:00 2001 From: copygirl Date: Fri, 19 Aug 2016 14:11:29 +0200 Subject: [PATCH] Update Material mappings (#19) * Update some Block mappings Fields: friction Methods: dropItems, dropStack, dropExperience Parameters: fortune Renamed EntityXPOrb to EntityExperienceOrb * Update Material mappings * Fix mixed-up PistonBehavior naming * Rename Material PLANT_BLOCK to PLANT_CUBE --- mappings/net/minecraft/block/Material.mapping | 13 ---- .../minecraft/block/material/Material.mapping | 61 +++++++++++++++++++ .../block/material/MaterialAir.mapping | 3 + .../block/material/MaterialLiquid.mapping | 6 ++ .../block/material/MaterialNonSolid.mapping | 3 + .../block/material/MaterialPortal.mapping | 3 + .../block/piston/PistonBehavior.mapping | 5 ++ 7 files changed, 81 insertions(+), 13 deletions(-) delete mode 100644 mappings/net/minecraft/block/Material.mapping create mode 100644 mappings/net/minecraft/block/material/Material.mapping create mode 100644 mappings/net/minecraft/block/material/MaterialAir.mapping create mode 100644 mappings/net/minecraft/block/material/MaterialLiquid.mapping create mode 100644 mappings/net/minecraft/block/material/MaterialNonSolid.mapping create mode 100644 mappings/net/minecraft/block/material/MaterialPortal.mapping create mode 100644 mappings/net/minecraft/block/piston/PistonBehavior.mapping diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping deleted file mode 100644 index 009fddf95d..0000000000 --- a/mappings/net/minecraft/block/Material.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS none/ayo net/minecraft/block/Material - FIELD A CACTUS Lnone/ayo; - FIELD a AIR Lnone/ayo; - FIELD d WOOD Lnone/ayo; - FIELD e STONE Lnone/ayo; - FIELD f METAL Lnone/ayo; - FIELD h WATER Lnone/ayo; - FIELD i LAVA Lnone/ayo; - FIELD n CLOTH Lnone/ayo; - FIELD p SAND Lnone/ayo; - FIELD s GLASS Lnone/ayo; - FIELD w ICE Lnone/ayo; - METHOD r getMapColor ()Lnone/ayp; diff --git a/mappings/net/minecraft/block/material/Material.mapping b/mappings/net/minecraft/block/material/Material.mapping new file mode 100644 index 0000000000..08be08478a --- /dev/null +++ b/mappings/net/minecraft/block/material/Material.mapping @@ -0,0 +1,61 @@ +CLASS none/ayo net/minecraft/block/material/Material + CLASS none/ayo$1 + METHOD c isSolid ()Z + FIELD A CACTUS Lnone/ayo; + FIELD B OTHER Lnone/ayo; + FIELD C PLANT_CUBE Lnone/ayo; + FIELD D DRAGON_EGG Lnone/ayo; + FIELD E PORTAL Lnone/ayo; + FIELD F CAKE Lnone/ayo; + FIELD G WEB Lnone/ayo; + FIELD H PISTON Lnone/ayo; + FIELD I BARRIER Lnone/ayo; + FIELD J STRUCTURE_VOID Lnone/ayo; + FIELD K flammable Z + FIELD L replaceable Z + FIELD M transparent Z + FIELD N color Lnone/ayp; + FIELD O harvestable Z + FIELD P pistonBehavior Lnone/ayr; + FIELD a AIR Lnone/ayo; + FIELD b GRASS Lnone/ayo; + FIELD c DIRT Lnone/ayo; + FIELD d WOOD Lnone/ayo; + FIELD e STONE Lnone/ayo; + FIELD f METAL Lnone/ayo; + FIELD g ANVIL Lnone/ayo; + FIELD h WATER Lnone/ayo; + FIELD i LAVA Lnone/ayo; + FIELD j LEAVES Lnone/ayo; + FIELD k PLANT Lnone/ayo; + FIELD l PLANT_FLAMMABLE Lnone/ayo; + FIELD m SPONGE Lnone/ayo; + FIELD n CLOTH Lnone/ayo; + FIELD o FIRE Lnone/ayo; + FIELD p SAND Lnone/ayo; + FIELD q DECORATION Lnone/ayo; + FIELD r CARPET Lnone/ayo; + FIELD s GLASS Lnone/ayo; + FIELD t REDSTONE_LAMP Lnone/ayo; + FIELD u TNT Lnone/ayo; + FIELD w ICE Lnone/ayo; + FIELD x PACKED_ICE Lnone/ayo; + FIELD y SNOW_LAYER Lnone/ayo; + FIELD z SNOW Lnone/ayo; + METHOD (Lnone/ayp;)V + ARG 0 color + METHOD a isFullBlock ()Z + METHOD c isSolid ()Z + METHOD d isLiquid ()Z + METHOD f setUnharvestable ()Lnone/ayo; + METHOD g setFlammable ()Lnone/ayo; + METHOD h getFlammable ()Z + METHOD i setReplaceable ()Lnone/ayo; + METHOD j getReplaceable ()Z + METHOD k isOpaque ()Z + METHOD l getHarvestable ()Z + METHOD m getPistonBehavior ()Lnone/ayr; + METHOD n setPistonBreakable ()Lnone/ayo; + METHOD o setPistonBlocking ()Lnone/ayo; + METHOD r getMapColor ()Lnone/ayp; + METHOD s setTransparent ()Lnone/ayo; diff --git a/mappings/net/minecraft/block/material/MaterialAir.mapping b/mappings/net/minecraft/block/material/MaterialAir.mapping new file mode 100644 index 0000000000..9c4a72302a --- /dev/null +++ b/mappings/net/minecraft/block/material/MaterialAir.mapping @@ -0,0 +1,3 @@ +CLASS none/aym net/minecraft/block/material/MaterialAir + METHOD a isFullBlock ()Z + METHOD c isSolid ()Z diff --git a/mappings/net/minecraft/block/material/MaterialLiquid.mapping b/mappings/net/minecraft/block/material/MaterialLiquid.mapping new file mode 100644 index 0000000000..ce28ea95aa --- /dev/null +++ b/mappings/net/minecraft/block/material/MaterialLiquid.mapping @@ -0,0 +1,6 @@ +CLASS none/ayn net/minecraft/block/material/MaterialLiquid + METHOD (Lnone/ayp;)V + ARG 0 color + METHOD a isFullBlock ()Z + METHOD c isSolid ()Z + METHOD d isLiquid ()Z diff --git a/mappings/net/minecraft/block/material/MaterialNonSolid.mapping b/mappings/net/minecraft/block/material/MaterialNonSolid.mapping new file mode 100644 index 0000000000..98e5e37f8a --- /dev/null +++ b/mappings/net/minecraft/block/material/MaterialNonSolid.mapping @@ -0,0 +1,3 @@ +CLASS none/ayl net/minecraft/block/material/MaterialNonSolid + METHOD a isFullBlock ()Z + METHOD c isSolid ()Z diff --git a/mappings/net/minecraft/block/material/MaterialPortal.mapping b/mappings/net/minecraft/block/material/MaterialPortal.mapping new file mode 100644 index 0000000000..42891ce04f --- /dev/null +++ b/mappings/net/minecraft/block/material/MaterialPortal.mapping @@ -0,0 +1,3 @@ +CLASS none/ayq net/minecraft/block/material/MaterialPortal + METHOD a isFullBlock ()Z + METHOD c isSolid ()Z diff --git a/mappings/net/minecraft/block/piston/PistonBehavior.mapping b/mappings/net/minecraft/block/piston/PistonBehavior.mapping new file mode 100644 index 0000000000..c10d3be1bc --- /dev/null +++ b/mappings/net/minecraft/block/piston/PistonBehavior.mapping @@ -0,0 +1,5 @@ +CLASS none/ayr net/minecraft/block/piston/PistonBehavior + FIELD a MOVE Lnone/ayr; + FIELD b BREAK Lnone/ayr; + FIELD c BLOCK Lnone/ayr; + FIELD d IGNORE Lnone/ayr;