From 734f18a028dd5b4c4554e06ae87118fe77bd5800 Mon Sep 17 00:00:00 2001 From: asie Date: Sun, 4 Nov 2018 09:23:45 +0100 Subject: [PATCH] map a few material names --- .../minecraft/BlockTallPlant.mapping} | 2 +- ...erTall.mapping => BlockTallFlower.mapping} | 2 +- ...Tall.mapping => BlockTallSeagrass.mapping} | 2 +- .../minecraft/block/BlockWitherRose.mapping} | 2 +- mappings/net/minecraft/block/Material.mapping | 24 +++++++++++++++++++ .../{DoorHalf.mapping => BlockHalf.mapping} | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) rename mappings/{bgd.mapping => net/minecraft/BlockTallPlant.mapping} (94%) rename mappings/net/minecraft/block/{BlockFlowerTall.mapping => BlockTallFlower.mapping} (88%) rename mappings/net/minecraft/block/{BlockSeagrassTall.mapping => BlockTallSeagrass.mapping} (89%) rename mappings/{bkz.mapping => net/minecraft/block/BlockWitherRose.mapping} (86%) rename mappings/net/minecraft/block/enums/{DoorHalf.mapping => BlockHalf.mapping} (64%) diff --git a/mappings/bgd.mapping b/mappings/net/minecraft/BlockTallPlant.mapping similarity index 94% rename from mappings/bgd.mapping rename to mappings/net/minecraft/BlockTallPlant.mapping index 098ce83e09..7afa29638d 100644 --- a/mappings/bgd.mapping +++ b/mappings/net/minecraft/BlockTallPlant.mapping @@ -1,4 +1,4 @@ -CLASS bgd +CLASS bgd net/minecraft/BlockTallPlant METHOD (Lbet$c;)V ARG 0 builder METHOD Y_ getOffsetType ()Lbet$b; diff --git a/mappings/net/minecraft/block/BlockFlowerTall.mapping b/mappings/net/minecraft/block/BlockTallFlower.mapping similarity index 88% rename from mappings/net/minecraft/block/BlockFlowerTall.mapping rename to mappings/net/minecraft/block/BlockTallFlower.mapping index bd9535ed5c..06f6e0338f 100644 --- a/mappings/net/minecraft/block/BlockFlowerTall.mapping +++ b/mappings/net/minecraft/block/BlockTallFlower.mapping @@ -1,4 +1,4 @@ -CLASS bkf net/minecraft/block/BlockFlowerTall +CLASS bkf net/minecraft/block/BlockTallFlower METHOD (Lbet$c;)V ARG 0 builder METHOD a isFertilizable (Lazg;Leq;Lbnh;Z)Z diff --git a/mappings/net/minecraft/block/BlockSeagrassTall.mapping b/mappings/net/minecraft/block/BlockTallSeagrass.mapping similarity index 89% rename from mappings/net/minecraft/block/BlockSeagrassTall.mapping rename to mappings/net/minecraft/block/BlockTallSeagrass.mapping index abc7afff08..54c361ef24 100644 --- a/mappings/net/minecraft/block/BlockSeagrassTall.mapping +++ b/mappings/net/minecraft/block/BlockTallSeagrass.mapping @@ -1,4 +1,4 @@ -CLASS bkh net/minecraft/block/BlockSeagrassTall +CLASS bkh net/minecraft/block/BlockTallSeagrass METHOD (Lbet$c;)V ARG 0 builder METHOD a getPlacementState (Lata;)Lbnh; diff --git a/mappings/bkz.mapping b/mappings/net/minecraft/block/BlockWitherRose.mapping similarity index 86% rename from mappings/bkz.mapping rename to mappings/net/minecraft/block/BlockWitherRose.mapping index 94ee78925f..5aee6acd93 100644 --- a/mappings/bkz.mapping +++ b/mappings/net/minecraft/block/BlockWitherRose.mapping @@ -1,4 +1,4 @@ -CLASS bkz +CLASS bkz net/minecraft/block/BlockWitherRose METHOD a onEntityCollision (Lbnh;Lazt;Leq;Lafv;)V ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 3ab3c0f560..772d2fd777 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,4 +1,28 @@ CLASS cbp net/minecraft/block/Material + FIELD A TNT Lcbp; + FIELD B LEAVES Lcbp; + FIELD C GLASS Lcbp; + FIELD D ICE Lcbp; + FIELD F STONE Lcbp; + FIELD H SNOW_BLOCK Lcbp; + FIELD I ANVIL Lcbp; + FIELD J BARRIER Lcbp; + FIELD K PISTON Lcbp; + FIELD O CAKE Lcbp; + FIELD P mapColor Lcbq; + FIELD Q pistonBehavior Lcbr; FIELD a AIR Lcbp; + FIELD b STRUCTURE_VOID Lcbp; + FIELD c PORTAL Lcbp; + FIELD i WATER Lcbp; + FIELD k LAVA Lcbp; + FIELD l SNOW Lcbp; + FIELD m FIRE Lcbp; + FIELD o COBWEB Lcbp; + FIELD r EARTH Lcbp; + FIELD u SAND Lcbp; + FIELD v SPONGE Lcbp; + FIELD w WOOD Lcbp; + FIELD z WOOL Lcbp; METHOD h getPistonBehavior ()Lcbr; METHOD i getMapColor ()Lcbq; diff --git a/mappings/net/minecraft/block/enums/DoorHalf.mapping b/mappings/net/minecraft/block/enums/BlockHalf.mapping similarity index 64% rename from mappings/net/minecraft/block/enums/DoorHalf.mapping rename to mappings/net/minecraft/block/enums/BlockHalf.mapping index dfa9921502..845b17d1e2 100644 --- a/mappings/net/minecraft/block/enums/DoorHalf.mapping +++ b/mappings/net/minecraft/block/enums/BlockHalf.mapping @@ -1,4 +1,4 @@ -CLASS bol net/minecraft/block/enums/DoorHalf +CLASS bol net/minecraft/block/enums/BlockHalf FIELD a UPPER Lbol; FIELD b LOWER Lbol; METHOD m asString ()Ljava/lang/String;