From 302c9c2a30625bc30101abeef4237236a13f1c5b Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 16 Apr 2021 16:20:14 +0200 Subject: [PATCH] Some block constants (#2335) --- mappings/net/minecraft/block/Blocks.mapping | 6 +++--- mappings/net/minecraft/block/CactusBlock.mapping | 1 + mappings/net/minecraft/block/CakeBlock.mapping | 1 + mappings/net/minecraft/block/ChorusFlowerBlock.mapping | 1 + mappings/net/minecraft/block/CocoaBlock.mapping | 1 + mappings/net/minecraft/block/ComposterBlock.mapping | 1 + mappings/net/minecraft/block/CropBlock.mapping | 1 + mappings/net/minecraft/block/FarmlandBlock.mapping | 1 + mappings/net/minecraft/block/FrostedIceBlock.mapping | 1 + mappings/net/minecraft/block/HoneyBlock.mapping | 1 + mappings/net/minecraft/block/LeavesBlock.mapping | 1 + mappings/net/minecraft/block/RespawnAnchorBlock.mapping | 2 ++ mappings/net/minecraft/block/ScaffoldingBlock.mapping | 1 + mappings/net/minecraft/block/SeaPickleBlock.mapping | 1 + mappings/net/minecraft/block/SnowBlock.mapping | 1 + mappings/net/minecraft/block/StemBlock.mapping | 1 + mappings/net/minecraft/block/SweetBerryBushBlock.mapping | 1 + 17 files changed, 20 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index a503818c18..81e1141fde 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -32,12 +32,12 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 2 pos ARG 3 type METHOD method_26115 createNetherStemBlock (Lnet/minecraft/class_3620;)Lnet/minecraft/class_2248; - ARG 0 materialColor + ARG 0 mapColor METHOD method_26116 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 1 state METHOD method_26117 createLogBlock (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;)Lnet/minecraft/class_2465; - ARG 0 topMaterialColor - ARG 1 sideMaterialColor + ARG 0 topMapColor + ARG 1 sideMapColor METHOD method_26118 (Lnet/minecraft/class_3620;Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 2 state METHOD method_26119 createPistonBlock (Z)Lnet/minecraft/class_2665; diff --git a/mappings/net/minecraft/block/CactusBlock.mapping b/mappings/net/minecraft/block/CactusBlock.mapping index 8c6d6bb719..756a90ac4c 100644 --- a/mappings/net/minecraft/block/CactusBlock.mapping +++ b/mappings/net/minecraft/block/CactusBlock.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_2266 net/minecraft/block/CactusBlock FIELD field_10709 AGE Lnet/minecraft/class_2758; FIELD field_10710 OUTLINE_SHAPE Lnet/minecraft/class_265; FIELD field_10711 COLLISION_SHAPE Lnet/minecraft/class_265; + FIELD field_31044 MAX_AGE I diff --git a/mappings/net/minecraft/block/CakeBlock.mapping b/mappings/net/minecraft/block/CakeBlock.mapping index fa97392aa7..b5c1df0e2f 100644 --- a/mappings/net/minecraft/block/CakeBlock.mapping +++ b/mappings/net/minecraft/block/CakeBlock.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2272 net/minecraft/block/CakeBlock FIELD field_10738 BITES_TO_SHAPE [Lnet/minecraft/class_265; FIELD field_10739 BITES Lnet/minecraft/class_2758; FIELD field_27173 DEFAULT_COMPARATOR_OUTPUT I + FIELD field_31046 MAX_BITES I METHOD method_31627 getComparatorOutput (I)I ARG 0 bites METHOD method_9719 tryEat (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; diff --git a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping index 7e352a72a5..2da21763ae 100644 --- a/mappings/net/minecraft/block/ChorusFlowerBlock.mapping +++ b/mappings/net/minecraft/block/ChorusFlowerBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2279 net/minecraft/block/ChorusFlowerBlock FIELD field_10762 AGE Lnet/minecraft/class_2758; FIELD field_10763 plantBlock Lnet/minecraft/class_2283; + FIELD field_31060 MAX_AGE I METHOD (Lnet/minecraft/class_2283;Lnet/minecraft/class_4970$class_2251;)V ARG 1 plantBlock ARG 2 settings diff --git a/mappings/net/minecraft/block/CocoaBlock.mapping b/mappings/net/minecraft/block/CocoaBlock.mapping index 17d342c962..4e1f257d21 100644 --- a/mappings/net/minecraft/block/CocoaBlock.mapping +++ b/mappings/net/minecraft/block/CocoaBlock.mapping @@ -4,3 +4,4 @@ CLASS net/minecraft/class_2282 net/minecraft/block/CocoaBlock FIELD field_10778 AGE_TO_EAST_SHAPE [Lnet/minecraft/class_265; FIELD field_10779 AGE Lnet/minecraft/class_2758; FIELD field_10780 AGE_TO_SOUTH_SHAPE [Lnet/minecraft/class_265; + FIELD field_31061 MAX_AGE I diff --git a/mappings/net/minecraft/block/ComposterBlock.mapping b/mappings/net/minecraft/block/ComposterBlock.mapping index 7e2ea900c9..def3c7bea9 100644 --- a/mappings/net/minecraft/block/ComposterBlock.mapping +++ b/mappings/net/minecraft/block/ComposterBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3962 net/minecraft/block/ComposterBlock FIELD field_17566 ITEM_TO_LEVEL_INCREASE_CHANCE Lit/unimi/dsi/fastutil/objects/Object2FloatMap; FIELD field_17567 RAY_TRACE_SHAPE Lnet/minecraft/class_265; FIELD field_17568 LEVEL_TO_COLLISION_SHAPE [Lnet/minecraft/class_265; + FIELD field_31071 MAX_LEVEL I METHOD method_17753 registerCompostableItem (FLnet/minecraft/class_1935;)V ARG 0 levelIncreaseChance ARG 1 item diff --git a/mappings/net/minecraft/block/CropBlock.mapping b/mappings/net/minecraft/block/CropBlock.mapping index d8df0da6a7..698311e100 100644 --- a/mappings/net/minecraft/block/CropBlock.mapping +++ b/mappings/net/minecraft/block/CropBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2302 net/minecraft/block/CropBlock FIELD field_10835 AGE Lnet/minecraft/class_2758; FIELD field_10836 AGE_TO_SHAPE [Lnet/minecraft/class_265; + FIELD field_31079 MAX_AGE I METHOD method_9824 getAgeProperty ()Lnet/minecraft/class_2758; METHOD method_9825 isMature (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/block/FarmlandBlock.mapping b/mappings/net/minecraft/block/FarmlandBlock.mapping index 67c33d0d60..9d5f61476d 100644 --- a/mappings/net/minecraft/block/FarmlandBlock.mapping +++ b/mappings/net/minecraft/block/FarmlandBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2344 net/minecraft/block/FarmlandBlock FIELD field_11009 MOISTURE Lnet/minecraft/class_2758; FIELD field_11010 SHAPE Lnet/minecraft/class_265; + FIELD field_31084 MAX_MOISTURE I METHOD method_10124 hasCrop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/FrostedIceBlock.mapping b/mappings/net/minecraft/block/FrostedIceBlock.mapping index dd88f1d165..b285a4dc89 100644 --- a/mappings/net/minecraft/block/FrostedIceBlock.mapping +++ b/mappings/net/minecraft/block/FrostedIceBlock.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2360 net/minecraft/block/FrostedIceBlock FIELD field_11097 AGE Lnet/minecraft/class_2758; + FIELD field_31096 MAX_AGE I METHOD method_10201 increaseAge (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 state ARG 2 world diff --git a/mappings/net/minecraft/block/HoneyBlock.mapping b/mappings/net/minecraft/block/HoneyBlock.mapping index f49a3562ab..5a00763518 100644 --- a/mappings/net/minecraft/block/HoneyBlock.mapping +++ b/mappings/net/minecraft/block/HoneyBlock.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4622 net/minecraft/block/HoneyBlock FIELD field_21213 SHAPE Lnet/minecraft/class_265; + FIELD field_31104 TICKS_PER_SECOND I METHOD method_23355 addParticles (Lnet/minecraft/class_1297;I)V ARG 0 entity ARG 1 count diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping index aa2ba2e7c9..b30a5372ae 100644 --- a/mappings/net/minecraft/block/LeavesBlock.mapping +++ b/mappings/net/minecraft/block/LeavesBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock FIELD field_11199 DISTANCE Lnet/minecraft/class_2758; FIELD field_11200 PERSISTENT Lnet/minecraft/class_2746; + FIELD field_31111 MAX_DISTANCE I METHOD method_10300 updateDistanceFromLogs (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping index 498a2dfb25..ca302fcbee 100644 --- a/mappings/net/minecraft/block/RespawnAnchorBlock.mapping +++ b/mappings/net/minecraft/block/RespawnAnchorBlock.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_4969 net/minecraft/block/RespawnAnchorBlock FIELD field_23153 CHARGES Lnet/minecraft/class_2758; FIELD field_26442 VALID_HORIZONTAL_SPAWN_OFFSETS Lcom/google/common/collect/ImmutableList; FIELD field_26443 VALID_SPAWN_OFFSETS Lcom/google/common/collect/ImmutableList; + FIELD field_31231 NO_CHARGES I + FIELD field_31232 MAX_CHARGES I METHOD method_26156 findRespawnPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 0 entity ARG 1 world diff --git a/mappings/net/minecraft/block/ScaffoldingBlock.mapping b/mappings/net/minecraft/block/ScaffoldingBlock.mapping index 7c03095324..2876c80bee 100644 --- a/mappings/net/minecraft/block/ScaffoldingBlock.mapping +++ b/mappings/net/minecraft/block/ScaffoldingBlock.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_3736 net/minecraft/block/ScaffoldingBlock FIELD field_16547 BOTTOM Lnet/minecraft/class_2746; FIELD field_17577 COLLISION_SHAPE Lnet/minecraft/class_265; FIELD field_17578 OUTLINE_SHAPE Lnet/minecraft/class_265; + FIELD field_31237 MAX_DISTANCE I METHOD method_16372 calculateDistance (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/SeaPickleBlock.mapping b/mappings/net/minecraft/block/SeaPickleBlock.mapping index f7cb9116dc..081cbef03d 100644 --- a/mappings/net/minecraft/block/SeaPickleBlock.mapping +++ b/mappings/net/minecraft/block/SeaPickleBlock.mapping @@ -5,5 +5,6 @@ CLASS net/minecraft/class_2472 net/minecraft/block/SeaPickleBlock FIELD field_11473 ONE_PICKLE_SHAPE Lnet/minecraft/class_265; FIELD field_11474 FOUR_PICKLES_SHAPE Lnet/minecraft/class_265; FIELD field_11475 WATERLOGGED Lnet/minecraft/class_2746; + FIELD field_31241 MAX_PICKLES I METHOD method_10506 isDry (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/block/SnowBlock.mapping b/mappings/net/minecraft/block/SnowBlock.mapping index e517253e78..5cf9039da7 100644 --- a/mappings/net/minecraft/block/SnowBlock.mapping +++ b/mappings/net/minecraft/block/SnowBlock.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_2488 net/minecraft/block/SnowBlock FIELD field_11517 LAYERS_TO_SHAPE [Lnet/minecraft/class_265; FIELD field_11518 LAYERS Lnet/minecraft/class_2758; + FIELD field_31247 MAX_LAYERS I diff --git a/mappings/net/minecraft/block/StemBlock.mapping b/mappings/net/minecraft/block/StemBlock.mapping index 4acc98e766..d657118bf3 100644 --- a/mappings/net/minecraft/block/StemBlock.mapping +++ b/mappings/net/minecraft/block/StemBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2513 net/minecraft/block/StemBlock FIELD field_11584 AGE Lnet/minecraft/class_2758; FIELD field_11585 gourdBlock Lnet/minecraft/class_2511; FIELD field_27205 pickBlockItem Ljava/util/function/Supplier; + FIELD field_31255 MAX_AGE I METHOD (Lnet/minecraft/class_2511;Ljava/util/function/Supplier;Lnet/minecraft/class_4970$class_2251;)V ARG 1 gourdBlock ARG 2 pickBlockItem diff --git a/mappings/net/minecraft/block/SweetBerryBushBlock.mapping b/mappings/net/minecraft/block/SweetBerryBushBlock.mapping index d1aa8c9f65..282df93398 100644 --- a/mappings/net/minecraft/block/SweetBerryBushBlock.mapping +++ b/mappings/net/minecraft/block/SweetBerryBushBlock.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_3830 net/minecraft/block/SweetBerryBushBlock FIELD field_17000 AGE Lnet/minecraft/class_2758; FIELD field_17001 SMALL_SHAPE Lnet/minecraft/class_265; FIELD field_17002 LARGE_SHAPE Lnet/minecraft/class_265; + FIELD field_31259 MAX_AGE I