From e871ca625db759651139f332a4b0f860a280db50 Mon Sep 17 00:00:00 2001 From: asie Date: Thu, 22 Nov 2018 08:24:58 +0100 Subject: [PATCH] merge missing Prospector stuff --- .../net/minecraft/block/BlockSapling.mapping | 1 + mappings/net/minecraft/block/Material.mapping | 20 +++++++++++++++++++ .../sapling/AcaciaSaplingGenerator.mapping | 2 ++ .../sapling/BirchSaplingGenerator.mapping | 2 ++ .../sapling/DarkOakSaplingGenerator.mapping | 3 +++ .../sapling/JungleSaplingGenerator.mapping | 3 +++ .../sapling/LargeTreeSaplingGenerator.mapping | 3 +++ .../block/sapling/OakSaplingGenerator.mapping | 2 ++ .../block/sapling/SaplingGenerator.mapping | 3 +++ .../sapling/SpruceSaplingGenerator.mapping | 3 +++ .../net/minecraft/util/LazySingleton.mapping | 1 - 11 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/SaplingGenerator.mapping create mode 100644 mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping delete mode 100644 mappings/net/minecraft/util/LazySingleton.mapping diff --git a/mappings/net/minecraft/block/BlockSapling.mapping b/mappings/net/minecraft/block/BlockSapling.mapping index 3254cde7e7..13463fc902 100644 --- a/mappings/net/minecraft/block/BlockSapling.mapping +++ b/mappings/net/minecraft/block/BlockSapling.mapping @@ -1,4 +1,5 @@ CLASS bjz net/minecraft/block/BlockSapling + FIELD c generator Lbnq; METHOD a isFertilizable (Lazy;Les;Lboh;Z)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index a2fbe1a4ca..47b24de4d4 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,4 +1,11 @@ CLASS cdk net/minecraft/block/Material + CLASS cdk$a Builder + FIELD a pistonBehavior Lcdm; + FIELD h mapColor Lcdl; + METHOD f ()Lcdk$a; + METHOD g destroyedByPiston ()Lcdk$a; + METHOD h blocksPistons ()Lcdk$a; + METHOD i build ()Lcdk; FIELD A TNT Lcdk; FIELD B LEAVES Lcdk; FIELD C GLASS Lcdk; @@ -14,15 +21,28 @@ CLASS cdk net/minecraft/block/Material FIELD a AIR Lcdk; FIELD b STRUCTURE_VOID Lcdk; FIELD c PORTAL Lcdk; + FIELD d CARPET Lcdk; + FIELD e PLANT Lcdk; + FIELD f UNDERWATER_PLANT Lcdk; + FIELD g REPLACEABLE_PLANT Lcdk; + FIELD h SEAGRASS Lcdk; FIELD i WATER Lcdk; + FIELD j BUBBLE_COLUMN Lcdk; FIELD k LAVA Lcdk; FIELD l SNOW Lcdk; FIELD m FIRE Lcdk; + FIELD n PART Lcdk; FIELD o COBWEB Lcdk; + FIELD p REDSTONE_LAMP Lcdk; + FIELD q CLAY Lcdk; FIELD r EARTH Lcdk; + FIELD s ORGANIC Lcdk; + FIELD t PACKED_ICE Lcdk; FIELD u SAND Lcdk; FIELD v SPONGE Lcdk; FIELD w WOOD Lcdk; + FIELD x BAMBOO_SAPLING Lcdk; + FIELD y BAMBOO Lcdk; FIELD z WOOL Lcdk; METHOD h getPistonBehavior ()Lcdm; METHOD i getMapColor ()Lcdl; diff --git a/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping new file mode 100644 index 0000000000..db938802c4 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping @@ -0,0 +1,2 @@ +CLASS bnr net/minecraft/block/sapling/AcaciaSaplingGenerator + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping new file mode 100644 index 0000000000..e0f1b72f84 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping @@ -0,0 +1,2 @@ +CLASS bns net/minecraft/block/sapling/BirchSaplingGenerator + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping new file mode 100644 index 0000000000..d43d9496c1 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping @@ -0,0 +1,3 @@ +CLASS bnt net/minecraft/block/sapling/DarkOakSaplingGenerator + METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsp; + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping new file mode 100644 index 0000000000..09a91905f4 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping @@ -0,0 +1,3 @@ +CLASS bnu net/minecraft/block/sapling/JungleSaplingGenerator + METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsp; + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping new file mode 100644 index 0000000000..eea39ca3ca --- /dev/null +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -0,0 +1,3 @@ +CLASS bnp net/minecraft/block/sapling/LargeTreeSaplingGenerator + METHOD a generate (Lban;Les;Lboh;Ljava/util/Random;)Z + METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping new file mode 100644 index 0000000000..627e88e5c7 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping @@ -0,0 +1,2 @@ +CLASS bnv net/minecraft/block/sapling/OakSaplingGenerator + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping new file mode 100644 index 0000000000..349d5f28e4 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -0,0 +1,3 @@ +CLASS bnq net/minecraft/block/sapling/SaplingGenerator + METHOD a generate (Lban;Les;Lboh;Ljava/util/Random;)Z + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping new file mode 100644 index 0000000000..f8398dc797 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping @@ -0,0 +1,3 @@ +CLASS bnw net/minecraft/block/sapling/SpruceSaplingGenerator + METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsp; + METHOD b getTreeFeature (Ljava/util/Random;)Lbsp; diff --git a/mappings/net/minecraft/util/LazySingleton.mapping b/mappings/net/minecraft/util/LazySingleton.mapping deleted file mode 100644 index abc8c4e904..0000000000 --- a/mappings/net/minecraft/util/LazySingleton.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bnq net/minecraft/util/LazySingleton