From 931d05b2ddc686430ebd5aeb11d33a2cf56e7972 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 2 Apr 2021 22:59:25 +1100 Subject: [PATCH] 21w13a block stuff (#2230) * block * constant name changes --- .../block/AbstractCandleBlock.mapping | 4 ++++ .../block/AbstractCauldronBlock.mapping | 1 + .../block/AbstractPlantStemBlock.mapping | 1 + .../net/minecraft/block/AnvilBlock.mapping | 2 ++ .../net/minecraft/block/AzaleaBlock.mapping | 1 + mappings/net/minecraft/block/Block.mapping | 24 +++++++++++++++++++ .../net/minecraft/block/ShapeContext.mapping | 2 ++ .../block/entity/BannerBlockEntity.mapping | 3 +++ .../block/entity/BeehiveBlockEntity.mapping | 20 ++++++++++++++++ .../block/entity/JigsawBlockEntity.mapping | 5 ++++ .../LootableContainerBlockEntity.mapping | 2 ++ .../entity/ShulkerBoxBlockEntity.mapping | 1 + .../block/entity/SkullBlockEntity.mapping | 1 + .../entity/StructureBlockBlockEntity.mapping | 2 ++ .../minecraft/block/enums/RailShape.mapping | 1 + .../block/pattern/BlockPattern.mapping | 4 ++++ .../block/piston/PistonHandler.mapping | 1 + 17 files changed, 75 insertions(+) diff --git a/mappings/net/minecraft/block/AbstractCandleBlock.mapping b/mappings/net/minecraft/block/AbstractCandleBlock.mapping index c137dbb37e..8bb8836f03 100644 --- a/mappings/net/minecraft/block/AbstractCandleBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCandleBlock.mapping @@ -18,3 +18,7 @@ CLASS net/minecraft/class_5540 net/minecraft/block/AbstractCandleBlock ARG 1 state ARG 2 world ARG 3 pos + METHOD method_35245 isLitCandle (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_35246 isNotLit (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping index 447fca2982..79aafd5d71 100644 --- a/mappings/net/minecraft/block/AbstractCauldronBlock.mapping +++ b/mappings/net/minecraft/block/AbstractCauldronBlock.mapping @@ -19,3 +19,4 @@ CLASS net/minecraft/class_2275 net/minecraft/block/AbstractCauldronBlock METHOD method_32765 canBeFilledByDripstone (Lnet/minecraft/class_3611;)Z ARG 1 fluid METHOD method_32766 isFull (Lnet/minecraft/class_2680;)Z + ARG 1 state diff --git a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping index 0c2d802044..d7f953069c 100644 --- a/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping +++ b/mappings/net/minecraft/block/AbstractPlantStemBlock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4865 net/minecraft/block/AbstractPlantStemBlock FIELD field_22509 AGE Lnet/minecraft/class_2758; FIELD field_22510 growthChance D + FIELD field_31100 MAX_AGE I METHOD (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_2350;Lnet/minecraft/class_265;ZD)V ARG 1 settings ARG 2 growthDirection diff --git a/mappings/net/minecraft/block/AnvilBlock.mapping b/mappings/net/minecraft/block/AnvilBlock.mapping index 721fb7c49d..45f513dcba 100644 --- a/mappings/net/minecraft/block/AnvilBlock.mapping +++ b/mappings/net/minecraft/block/AnvilBlock.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2199 net/minecraft/block/AnvilBlock FIELD field_17349 TITLE Lnet/minecraft/class_2561; + FIELD field_30993 FALLING_BLOCK_ENTITY_DAMAGE_MULTIPLIER F + FIELD field_30994 FALLING_BLOCK_ENTITY_MAX_DAMAGE I FIELD field_9882 BASE_SHAPE Lnet/minecraft/class_265; FIELD field_9883 FACING Lnet/minecraft/class_2753; FIELD field_9884 X_FACE_SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/AzaleaBlock.mapping b/mappings/net/minecraft/block/AzaleaBlock.mapping index bad774fe3d..b5b5f6b788 100644 --- a/mappings/net/minecraft/block/AzaleaBlock.mapping +++ b/mappings/net/minecraft/block/AzaleaBlock.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_5800 net/minecraft/block/AzaleaBlock + FIELD field_30996 SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index dd0cc0e174..defee33349 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -7,6 +7,24 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_10651 STATE_IDS Lnet/minecraft/class_2361; FIELD field_17562 cachedItem Lnet/minecraft/class_1792; FIELD field_19312 FULL_CUBE_SHAPE_CACHE Lcom/google/common/cache/LoadingCache; + FIELD field_31027 PROPAGATE_CHANGE I + COMMENT Propagates a change event to surrounding blocks. + FIELD field_31028 NOTIFY_LISTENERS I + COMMENT Notifies listeners and clients who need to react when the block changes. + FIELD field_31029 NO_REDRAW I + COMMENT Used in conjunction with {@link #NOTIFY_LISTENERS} to suppress the render pass on clients. + FIELD field_31030 REDRAW_ON_MAIN_THREAD I + COMMENT Forces a synchronous redraw on clients. + FIELD field_31031 FORCE_STATE I + COMMENT Bypass virtual block state changes and forces the passed state to be stored as-is. + FIELD field_31032 SKIP_DROPS I + COMMENT Prevents the previous block (container) from dropping items when destroyed. + FIELD field_31033 MOVED I + COMMENT Signals that the current block is being moved to a different location, usually because of a piston. + FIELD field_31034 SKIP_LIGHTING_UPDATES I + COMMENT Signals that lighting updates should be skipped. + FIELD field_31036 DEFAULT_SET_BLOCK_STATE_FLAG I + COMMENT The default setBlockState behavior. Same as {@code PROPAGATE_CHANGE | NOTIFY_LISTENERS}. METHOD method_16361 hasTopRim (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -45,6 +63,12 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 property METHOD method_34725 getStateWithProperties (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; COMMENT Gets a block state with all properties that both this block and the source block state have. + ARG 1 state + METHOD method_35257 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 2 stack + METHOD method_35258 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_47$class_48;)V + ARG 0 state + ARG 1 lootContext METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state ARG 2 world diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping index fc8a9ee3f6..75808214ab 100644 --- a/mappings/net/minecraft/block/ShapeContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext METHOD method_27866 canWalkOnFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z ARG 1 state ARG 2 fluid + METHOD method_35591 isWearingOnFeet (Lnet/minecraft/class_1792;)Z + ARG 1 item diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index fd242f6f21..4d9315e39f 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11772 customName Lnet/minecraft/class_2561; FIELD field_11773 patternListTag Lnet/minecraft/class_2499; FIELD field_11774 baseColor Lnet/minecraft/class_1767; + FIELD field_31297 PATTERNS_KEY Ljava/lang/String; + FIELD field_31298 PATTERN_KEY Ljava/lang/String; + FIELD field_31299 COLOR_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 3698d91e96..f5b0ddf2e8 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity FIELD field_20423 bees Ljava/util/List; FIELD field_20424 flowerPos Lnet/minecraft/class_2338; + FIELD field_31306 FLOWER_POS_KEY Ljava/lang/String; + FIELD field_31307 MIN_OCCUPATION_TICKS_KEY Ljava/lang/String; + FIELD field_31308 ENTITY_DATA_KEY Ljava/lang/String; + FIELD field_31309 TICKS_IN_HIVE_KEY Ljava/lang/String; + FIELD field_31310 HAS_NECTAR_KEY Ljava/lang/String; + FIELD field_31311 BEES_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -17,9 +23,13 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD method_21852 tryReleaseBee (Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4484;)Ljava/util/List; ARG 1 state METHOD method_21855 releaseBee (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4483;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 2 state + ARG 3 bee METHOD method_21856 isFullOfBees ()Z METHOD method_21857 hasFlowerPos ()Z METHOD method_21858 tickBees (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/List;Lnet/minecraft/class_2338;)V + ARG 0 world METHOD method_21859 getBees ()Lnet/minecraft/class_2499; METHOD method_22400 hasNoBees ()Z METHOD method_23280 isNearFire ()Z @@ -28,7 +38,17 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD method_23903 getBeeCount ()I METHOD method_23904 isSmoked ()Z METHOD method_29562 ageBee (ILnet/minecraft/class_4466;)V + ARG 0 ticks + ARG 1 bee METHOD method_31656 serverTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_4482;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_35292 addBee (Lnet/minecraft/class_2487;IZ)V + ARG 1 nbtCompound + ARG 2 ticksInHive + ARG 3 hasNectar CLASS class_4483 Bee FIELD field_20425 entityData Lnet/minecraft/class_2487; FIELD field_20426 ticksInHive I diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping index 99049b931e..ea59bcfad0 100644 --- a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping @@ -4,6 +4,11 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity FIELD field_16552 target Lnet/minecraft/class_2960; FIELD field_23327 pool Lnet/minecraft/class_2960; FIELD field_23328 joint Lnet/minecraft/class_3751$class_4991; + FIELD field_31343 TARGET_KEY Ljava/lang/String; + FIELD field_31344 POOL_KEY Ljava/lang/String; + FIELD field_31345 JOINT_KEY Ljava/lang/String; + FIELD field_31346 NAME_KEY Ljava/lang/String; + FIELD field_31347 FINAL_STATE_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index 69156408db..4803adb0ee 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity FIELD field_12036 lootTableSeed J FIELD field_12037 lootTableId Lnet/minecraft/class_2960; + FIELD field_31352 LOOT_TABLE_SEED_KEY Ljava/lang/String; + FIELD field_31353 LOOT_TABLE_KEY Ljava/lang/String; METHOD method_11281 setInvStackList (Lnet/minecraft/class_2371;)V ARG 1 list METHOD method_11282 getInvStackList ()Lnet/minecraft/class_2371; diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index d571d5071b..9d31084e72 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity FIELD field_12057 animationStage Lnet/minecraft/class_2627$class_2628; FIELD field_12059 AVAILABLE_SLOTS [I FIELD field_12060 cachedColor Lnet/minecraft/class_1767; + FIELD field_31361 ITEMS_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 color ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 4251a43256..fb23b1798c 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_12087 owner Lcom/mojang/authlib/GameProfile; FIELD field_12088 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD field_12089 userCache Lnet/minecraft/class_3312; + FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index 35949cdb50..dfe85a8bed 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt FIELD field_12103 seed J FIELD field_12104 author Ljava/lang/String; FIELD field_12105 rotation Lnet/minecraft/class_2470; + FIELD field_31366 AUTHOR_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -59,6 +60,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11376 loadStructure (Lnet/minecraft/class_3218;)Z ARG 1 world METHOD method_11377 setSize (Lnet/minecraft/class_2382;)V + ARG 1 size METHOD method_11378 setOffset (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_11379 setPowered (Z)V diff --git a/mappings/net/minecraft/block/enums/RailShape.mapping b/mappings/net/minecraft/block/enums/RailShape.mapping index d3c8cd2c3f..a5d268581e 100644 --- a/mappings/net/minecraft/block/enums/RailShape.mapping +++ b/mappings/net/minecraft/block/enums/RailShape.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_2768 net/minecraft/block/enums/RailShape METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_11897 isAscending ()Z + METHOD method_35309 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/pattern/BlockPattern.mapping b/mappings/net/minecraft/block/pattern/BlockPattern.mapping index a0487de79f..0d0d80bfad 100644 --- a/mappings/net/minecraft/block/pattern/BlockPattern.mapping +++ b/mappings/net/minecraft/block/pattern/BlockPattern.mapping @@ -26,6 +26,7 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern ARG 4 cache METHOD method_11712 getDepth ()I METHOD method_11713 getHeight ()I + METHOD method_35301 getPattern ()[[[Ljava/util/function/Predicate; CLASS class_2701 BlockStateCacheLoader FIELD field_12359 world Lnet/minecraft/class_4538; FIELD field_12360 forceLoad Z @@ -57,3 +58,6 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern ARG 2 offsetDown ARG 3 offsetForwards METHOD method_11719 getForwards ()Lnet/minecraft/class_2350; + METHOD method_35302 getWidth ()I + METHOD method_35303 getHeight ()I + METHOD method_35304 getDepth ()I diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index 1342262d7b..d26653b10d 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler METHOD method_23675 isAdjacentBlockStuck (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z ARG 0 state ARG 1 adjacentState + METHOD method_35299 getMotionDirection ()Lnet/minecraft/class_2350;