diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index e942d007f4..b0193bd7ea 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -30,6 +30,8 @@ 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_31022 NOTIFY_ALL_AND_REDRAW I + COMMENT Notifies neighbors and listeners, and forces a redraw on clients. Same as {@code NOTIFY_ALL | REDRAW_ON_MAIN_THREAD} FIELD field_31027 NOTIFY_NEIGHBORS I COMMENT Sends a neighbor update event to surrounding blocks. FIELD field_31028 NOTIFY_LISTENERS I diff --git a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping index 127071bf2d..28a55c536e 100644 --- a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping +++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState - FIELD field_47390 EJECT_REWARDS_COOLDOWN I + FIELD field_47389 START_EJECTING_REWARDS_COOLDOWN F + FIELD field_47390 BETWEEN_EJECTING_REWARDS_COOLDOWN I FIELD field_47391 id Ljava/lang/String; FIELD field_47392 luminance I FIELD field_47393 displayRotationSpeed D @@ -28,6 +29,10 @@ CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState METHOD method_55215 getDisplayRotationSpeed ()D METHOD method_55216 doesDisplayRotate ()Z METHOD method_55217 playsSound ()Z + CLASS class_8968 Luminance + FIELD field_47398 NONE I + FIELD field_47399 LOW I + FIELD field_47400 HIGH I CLASS class_8969 ParticleEmitter FIELD field_47401 NONE Lnet/minecraft/class_8967$class_8969; FIELD field_47402 WAITING Lnet/minecraft/class_8967$class_8969; @@ -57,3 +62,7 @@ CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState ARG 0 world ARG 1 random ARG 2 pos + CLASS class_8970 DisplayRotationSpeed + FIELD field_47405 NONE D + FIELD field_47406 SLOW D + FIELD field_47407 FAST D diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping index 5cecd5d0ea..622add9b4a 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping @@ -147,7 +147,7 @@ CLASS net/minecraft/class_6230 net/minecraft/client/render/entity/model/EntityMo FIELD field_42886 RIGHT_MID_LEG Ljava/lang/String; COMMENT The key of a right mid leg part, whose value is {@value}. FIELD field_47128 FEET Ljava/lang/String; - COMMENT The key of a feet part, whose value is {@value}. + COMMENT The key of a feet model part, whose value is {@value}. FIELD field_47446 WIND_BODY Ljava/lang/String; COMMENT The key of a wind body model part, whose value is {@value}. FIELD field_47447 WIND_TOP Ljava/lang/String; diff --git a/mappings/net/minecraft/data/client/TexturedModel.mapping b/mappings/net/minecraft/data/client/TexturedModel.mapping index 038583e948..37d5737652 100644 --- a/mappings/net/minecraft/data/client/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/TexturedModel.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/class_4946 net/minecraft/data/client/TexturedModel FIELD field_42953 FLOWERBED_2 Lnet/minecraft/class_4946$class_4947; FIELD field_42954 FLOWERBED_3 Lnet/minecraft/class_4946$class_4947; FIELD field_42955 FLOWERBED_4 Lnet/minecraft/class_4946$class_4947; + FIELD field_47502 CUBE_ALL_INNER_FACES Lnet/minecraft/class_4946$class_4947; METHOD (Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V ARG 1 textures ARG 2 model diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping index 729e7d7ead..1b788c7b26 100644 --- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping @@ -15,3 +15,5 @@ CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/vanilla/Vanil METHOD method_48512 createShipwreckTreasureChestTableBuilder ()Lnet/minecraft/class_52$class_53; METHOD method_48513 createPillagerOutpostChestTableBuilder ()Lnet/minecraft/class_52$class_53; METHOD method_48514 createDesertPyramidChestTableBuilder ()Lnet/minecraft/class_52$class_53; + METHOD method_55304 acceptTrialSpawnerTables (Ljava/util/function/BiConsumer;)V + ARG 0 exporter diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 83a7a4f7e6..6b5706cf0b 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity FIELD field_47277 slidingAnimationState Lnet/minecraft/class_7094; + FIELD field_47279 longJumpingParticleAddCount I FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094; FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094; + METHOD method_55006 addGustDustParticles ()Lnet/minecraft/class_8949; + METHOD method_55007 addBlockParticles (I)V + ARG 1 count + METHOD method_55008 addLongJumpingParticles ()V METHOD method_55009 getChargeY ()D METHOD method_55010 stopAnimations ()V METHOD method_55011 isWithinLargeRange (Lnet/minecraft/class_243;)Z @@ -11,3 +16,4 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity METHOD method_55013 isWithinShortRange (Lnet/minecraft/class_243;)Z ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_55015 resetLongJumpingParticleAddCount ()Lnet/minecraft/class_8949; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 692d7da032..2f23cbbfa3 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -77,6 +77,9 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_27324 (Ljava/util/Map$Entry;)Lnet/minecraft/class_1928$class_4315; ARG 0 entry METHOD method_27325 copy ()Lnet/minecraft/class_1928; + METHOD method_53838 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V + ARG 0 server + ARG 1 rule METHOD method_53839 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V ARG 0 server ARG 1 rule diff --git a/mappings/net/minecraft/world/dimension/NetherPortal.mapping b/mappings/net/minecraft/world/dimension/NetherPortal.mapping index d6e8399d3f..172c0e08a9 100644 --- a/mappings/net/minecraft/world/dimension/NetherPortal.mapping +++ b/mappings/net/minecraft/world/dimension/NetherPortal.mapping @@ -47,6 +47,8 @@ CLASS net/minecraft/class_2424 net/minecraft/world/dimension/NetherPortal ARG 0 state ARG 1 world ARG 2 pos + METHOD method_30488 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V + ARG 2 pos METHOD method_30489 (Lnet/minecraft/class_2424;)Z ARG 0 areaHelper METHOD method_30490 getPotentialHeight (Lnet/minecraft/class_2338$class_2339;)I diff --git a/unpick-definitions/entity_model_parts.unpick b/unpick-definitions/entity_model_parts.unpick index e1dafffff1..9bf1903492 100644 --- a/unpick-definitions/entity_model_parts.unpick +++ b/unpick-definitions/entity_model_parts.unpick @@ -21,12 +21,15 @@ constant entity_model_parts net/minecraft/client/render/entity/model/EntityModel constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_LEG constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_HIND_LEG constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_HIND_LEG +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_MID_LEG +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_MID_LEG constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_FRONT_LEG constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_FRONT_LEG constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_HIND_FOOT constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_HIND_FOOT constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_FRONT_FOOT constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_FRONT_FOOT +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames FEET constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_HIND_LEG_TIP constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_HIND_LEG_TIP constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_FRONT_LEG_TIP @@ -70,6 +73,11 @@ constant entity_model_parts net/minecraft/client/render/entity/model/EntityModel constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_TENDRIL constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_RIBCAGE constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_RIBCAGE +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_BODY +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_TOP +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_MID +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_BOTTOM +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RODS constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames BONE target_method net/minecraft/client/model/ModelPart getChild (Ljava/lang/String;)Lnet/minecraft/client/model/ModelPart; diff --git a/unpick-definitions/network_packets.unpick b/unpick-definitions/network_packets.unpick index c6013304d8..e58df199c8 100644 --- a/unpick-definitions/network_packets.unpick +++ b/unpick-definitions/network_packets.unpick @@ -1,24 +1,5 @@ v2 -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket MOB_SPAWNER -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket COMMAND_BLOCK -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket BEACON -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket SKULL -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket CONDUIT -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket BANNER -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket STRUCTURE -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket END_GATEWAY -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket SIGN -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket BED -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket JIGSAW -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket CAMPFIRE -constant s2c_block_entity_type net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket BEEHIVE - -target_method net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket (Lnet/minecraft/util/math/BlockPos;ILnet/minecraft/nbt/NbtCompound;)V - param 1 s2c_block_entity_type -target_method net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket getBlockEntityType ()I - return s2c_block_entity_type - constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket SWING_MAIN_HAND constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket WAKE_UP constant s2c_animation_id net/minecraft/network/packet/s2c/play/EntityAnimationS2CPacket SWING_OFF_HAND diff --git a/unpick-definitions/set_block_state_flags.unpick b/unpick-definitions/set_block_state_flags.unpick index 4b81317267..a91e916241 100644 --- a/unpick-definitions/set_block_state_flags.unpick +++ b/unpick-definitions/set_block_state_flags.unpick @@ -1,5 +1,6 @@ v2 +flag set_block_state_flags net/minecraft/block/Block NOTIFY_ALL_AND_REDRAW flag set_block_state_flags net/minecraft/block/Block NOTIFY_ALL flag set_block_state_flags net/minecraft/block/Block NOTIFY_NEIGHBORS flag set_block_state_flags net/minecraft/block/Block NOTIFY_LISTENERS @@ -23,6 +24,8 @@ target_method net/minecraft/block/AbstractBlock$AbstractBlockState updateNeighbo param 2 set_block_state_flags target_method net/minecraft/block/Block replace (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V param 4 set_block_state_flags +target_method net/minecraft/block/Block replace (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;I)V + param 4 set_block_state_flags target_method net/minecraft/block/AbstractBlock prepare (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;II)V param 3 set_block_state_flags target_method net/minecraft/block/TallPlantBlock placeAt (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;I)V @@ -35,3 +38,13 @@ target_method net/minecraft/structure/Structure place (Lnet/minecraft/world/Serv param 5 set_block_state_flags target_method net/minecraft/structure/Structure updateCorner (Lnet/minecraft/world/WorldAccess;ILnet/minecraft/util/shape/VoxelSet;III)V param 1 set_block_state_flags +target_method net/minecraft/world/block/NeighborUpdater replaceWithStateForNeighborUpdate (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;II)V + param 4 set_block_state_flags +target_method net/minecraft/world/block/NeighborUpdater replaceWithStateForNeighborUpdate (Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;II)V + param 5 set_block_state_flags +target_method net/minecraft/world/WorldAccess replaceWithStateForNeighborUpdate (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;II)V + param 4 set_block_state_flags +target_method net/minecraft/world/block/ChainRestrictedNeighborUpdater$StateReplacementEntry (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;II)V + param 4 set_block_state_flags +target_method net/minecraft/client/world/ClientWorld handleBlockUpdate (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)V + param 2 set_block_state_flags \ No newline at end of file diff --git a/unpick-definitions/trial_spawner_state.unpick b/unpick-definitions/trial_spawner_state.unpick new file mode 100644 index 0000000000..e147298a0f --- /dev/null +++ b/unpick-definitions/trial_spawner_state.unpick @@ -0,0 +1,24 @@ +v2 + +constant trial_spawner_luminance net/minecraft/block/enums/TrialSpawnerState$Luminance NONE +constant trial_spawner_luminance net/minecraft/block/enums/TrialSpawnerState$Luminance LOW +constant trial_spawner_luminance net/minecraft/block/enums/TrialSpawnerState$Luminance HIGH + +constant trial_spawner_display_rotation_speed net/minecraft/block/enums/TrialSpawnerState$DisplayRotationSpeed NONE +constant trial_spawner_display_rotation_speed net/minecraft/block/enums/TrialSpawnerState$DisplayRotationSpeed SLOW +constant trial_spawner_display_rotation_speed net/minecraft/block/enums/TrialSpawnerState$DisplayRotationSpeed FAST + +constant trial_spawner_cooldown net/minecraft/block/enums/TrialSpawnerState START_EJECTING_REWARDS_COOLDOWN + +target_method net/minecraft/block/enums/TrialSpawnerState (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;DZ)V + param 1 trial_spawner_luminance + param 3 trial_spawner_display_rotation_speed + +target_method net/minecraft/block/enums/TrialSpawnerState getLuminance ()I + return trial_spawner_luminance + +target_method net/minecraft/block/enums/TrialSpawnerState getDisplayRotationSpeed ()D + return trial_spawner_display_rotation_speed + +target_method net/minecraft/block/spawner/TrialSpawnerData isCooldownPast (Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/block/spawner/TrialSpawnerConfig;F)Z + param 2 trial_spawner_cooldown \ No newline at end of file