From a8e67455befe440cf3eff2710481893c22b55da7 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 19 Jun 2022 22:59:19 +1000 Subject: [PATCH] Allay Duplication mechanic and related (#3213) --- .../block/entity/JukeboxBlockEntity.mapping | 18 +++++++++++ .../entity/model/AllayEntityModel.mapping | 1 + .../entity/passive/AllayEntity.mapping | 31 +++++++++++++++++++ .../net/minecraft/item/MusicDiscItem.mapping | 3 ++ 4 files changed, 53 insertions(+) diff --git a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping index a023a7409a..451fe1f26c 100644 --- a/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping @@ -1,8 +1,26 @@ CLASS net/minecraft/class_2619 net/minecraft/block/entity/JukeboxBlockEntity FIELD field_12031 record Lnet/minecraft/class_1799; + FIELD field_39481 ticksThisSecond I + FIELD field_39482 tickCount J + FIELD field_39483 recordStartTick J + FIELD field_39484 isPlaying Z METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state METHOD method_11275 getRecord ()Lnet/minecraft/class_1799; METHOD method_11276 setRecord (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD method_44370 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 blockEntity + METHOD method_44371 hasSecondPassed (Lnet/minecraft/class_2619;)Z + ARG 0 blockEntity + METHOD method_44372 isSongFinished (Lnet/minecraft/class_2619;Lnet/minecraft/class_1813;)Z + ARG 0 blockEntity + ARG 1 musicDisc + METHOD method_44373 isPlayingRecord (Lnet/minecraft/class_2680;Lnet/minecraft/class_2619;)Z + ARG 0 state + ARG 1 blockEntity + METHOD method_44374 startPlaying ()V diff --git a/mappings/net/minecraft/client/render/entity/model/AllayEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/AllayEntityModel.mapping index 2583bc03d6..3ae062909c 100644 --- a/mappings/net/minecraft/client/render/entity/model/AllayEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AllayEntityModel.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_7308 net/minecraft/client/render/entity/model/AllayEnt FIELD field_38445 leftArm Lnet/minecraft/class_630; FIELD field_38446 rightWing Lnet/minecraft/class_630; FIELD field_38447 leftWing Lnet/minecraft/class_630; + FIELD field_39459 head Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_42733 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/entity/passive/AllayEntity.mapping b/mappings/net/minecraft/entity/passive/AllayEntity.mapping index ec2cf2b458..1dca9e3f85 100644 --- a/mappings/net/minecraft/entity/passive/AllayEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AllayEntity.mapping @@ -5,6 +5,37 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity FIELD field_38402 inventory Lnet/minecraft/class_1277; FIELD field_38403 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_38937 THROW_SOUND_PITCHES Lcom/google/common/collect/ImmutableList; + FIELD field_39464 DUPLICATION_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_39466 DANCING Lnet/minecraft/class_2940; + FIELD field_39467 CAN_DUPLICATE Lnet/minecraft/class_2940; + FIELD field_39468 listenerCallback Lnet/minecraft/class_5718$class_5719; + FIELD field_39469 jukeboxEventHandler Lnet/minecraft/class_5715; + FIELD field_39470 jukeboxPos Lnet/minecraft/class_2338; + FIELD field_39471 duplicationCooldown J + FIELD field_39475 queuedHeartParticles I METHOD method_42654 isItemPickupCoolingDown ()Z METHOD method_42655 createAllayAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_43396 isHoldingItem ()Z + METHOD method_44357 decrementStackUnlessInCreative (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 1 player + ARG 2 stack + METHOD method_44358 updateJukeboxPos (Lnet/minecraft/class_2338;Z)V + ARG 1 jukeboxPos + ARG 2 playing + METHOD method_44359 isDancing ()Z + METHOD method_44361 shouldStopDancing ()Z + METHOD method_44362 tickDuplicationCooldown ()V + METHOD method_44363 duplicate ()V + METHOD method_44364 startDuplicationCooldown ()V + METHOD method_44365 canDuplicate ()Z + METHOD method_44366 matchesDuplicationIngredient (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_44367 setDancing (Z)V + ARG 1 dancing + CLASS class_7524 VibrationListenerCallback + CLASS class_7525 JukeboxEventListener + FIELD field_39478 positionSource Lnet/minecraft/class_5716; + FIELD field_39479 range I + METHOD (Lnet/minecraft/class_7298;Lnet/minecraft/class_5716;I)V + ARG 2 positionSource + ARG 3 range diff --git a/mappings/net/minecraft/item/MusicDiscItem.mapping b/mappings/net/minecraft/item/MusicDiscItem.mapping index ce7b7be136..b696b2e713 100644 --- a/mappings/net/minecraft/item/MusicDiscItem.mapping +++ b/mappings/net/minecraft/item/MusicDiscItem.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1813 net/minecraft/item/MusicDiscItem + FIELD field_39480 lengthInTicks I FIELD field_8900 sound Lnet/minecraft/class_3414; FIELD field_8901 MUSIC_DISCS Ljava/util/Map; FIELD field_8902 comparatorOutput I @@ -6,6 +7,8 @@ CLASS net/minecraft/class_1813 net/minecraft/item/MusicDiscItem ARG 1 comparatorOutput ARG 2 sound ARG 3 settings + ARG 4 lengthInSeconds + METHOD method_44369 getSongLengthInTicks ()I METHOD method_8009 getSound ()Lnet/minecraft/class_3414; METHOD method_8010 getComparatorOutput ()I METHOD method_8011 getDescription ()Lnet/minecraft/class_5250;