Skip to content

Commit de66d84

Browse files
ipad54ipad54
authored
Implement new 1.20 and 1.21 records (#6572)
1 parent 636f562 commit de66d84

File tree

5 files changed

+29
-1
lines changed

5 files changed

+29
-1
lines changed

‎src/block/utils/RecordType.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,15 @@ enum RecordType{
5959
case DISK_CAT;
6060
case DISK_BLOCKS;
6161
case DISK_CHIRP;
62+
case DISK_CREATOR;
63+
case DISK_CREATOR_MUSIC_BOX;
6264
case DISK_FAR;
6365
case DISK_MALL;
6466
case DISK_MELLOHI;
6567
case DISK_OTHERSIDE;
6668
case DISK_PIGSTEP;
69+
case DISK_PRECIPICE;
70+
case DISK_RELIC;
6771
case DISK_STAL;
6872
case DISK_STRAD;
6973
case DISK_WARD;
@@ -83,11 +87,15 @@ private function getMetadata() : array{
8387
self::DISK_CAT => ["C418 - cat", LevelSoundEvent::RECORD_CAT, KnownTranslationFactory::item_record_cat_desc()],
8488
self::DISK_BLOCKS => ["C418 - blocks", LevelSoundEvent::RECORD_BLOCKS, KnownTranslationFactory::item_record_blocks_desc()],
8589
self::DISK_CHIRP => ["C418 - chirp", LevelSoundEvent::RECORD_CHIRP, KnownTranslationFactory::item_record_chirp_desc()],
90+
self::DISK_CREATOR => ["Lena Raine - Creator", LevelSoundEvent::RECORD_CREATOR, KnownTranslationFactory::item_record_creator_desc()],
91+
self::DISK_CREATOR_MUSIC_BOX => ["Lena Raine - Creator (Music Box)", LevelSoundEvent::RECORD_CREATOR_MUSIC_BOX, KnownTranslationFactory::item_record_creator_music_box_desc()],
8692
self::DISK_FAR => ["C418 - far", LevelSoundEvent::RECORD_FAR, KnownTranslationFactory::item_record_far_desc()],
8793
self::DISK_MALL => ["C418 - mall", LevelSoundEvent::RECORD_MALL, KnownTranslationFactory::item_record_mall_desc()],
8894
self::DISK_MELLOHI => ["C418 - mellohi", LevelSoundEvent::RECORD_MELLOHI, KnownTranslationFactory::item_record_mellohi_desc()],
8995
self::DISK_OTHERSIDE => ["Lena Raine - otherside", LevelSoundEvent::RECORD_OTHERSIDE, KnownTranslationFactory::item_record_otherside_desc()],
9096
self::DISK_PIGSTEP => ["Lena Raine - Pigstep", LevelSoundEvent::RECORD_PIGSTEP, KnownTranslationFactory::item_record_pigstep_desc()],
97+
self::DISK_PRECIPICE => ["Aaron Cherof - Precipice", LevelSoundEvent::RECORD_PRECIPICE, KnownTranslationFactory::item_record_precipice_desc()],
98+
self::DISK_RELIC => ["Aaron Cherof - Relic", LevelSoundEvent::RECORD_RELIC, KnownTranslationFactory::item_record_relic_desc()],
9199
self::DISK_STAL => ["C418 - stal", LevelSoundEvent::RECORD_STAL, KnownTranslationFactory::item_record_stal_desc()],
92100
self::DISK_STRAD => ["C418 - strad", LevelSoundEvent::RECORD_STRAD, KnownTranslationFactory::item_record_strad_desc()],
93101
self::DISK_WARD => ["C418 - ward", LevelSoundEvent::RECORD_WARD, KnownTranslationFactory::item_record_ward_desc()],

‎src/data/bedrock/item/ItemSerializerDeserializerRegistrar.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,15 @@ private function register1to1ItemMappings() : void{
303303
$this->map1to1Item(Ids::MUSIC_DISC_BLOCKS, Items::RECORD_BLOCKS());
304304
$this->map1to1Item(Ids::MUSIC_DISC_CAT, Items::RECORD_CAT());
305305
$this->map1to1Item(Ids::MUSIC_DISC_CHIRP, Items::RECORD_CHIRP());
306+
$this->map1to1Item(Ids::MUSIC_DISC_CREATOR, Items::RECORD_CREATOR());
307+
$this->map1to1Item(Ids::MUSIC_DISC_CREATOR_MUSIC_BOX, Items::RECORD_CREATOR_MUSIC_BOX());
306308
$this->map1to1Item(Ids::MUSIC_DISC_FAR, Items::RECORD_FAR());
307309
$this->map1to1Item(Ids::MUSIC_DISC_MALL, Items::RECORD_MALL());
308310
$this->map1to1Item(Ids::MUSIC_DISC_MELLOHI, Items::RECORD_MELLOHI());
309311
$this->map1to1Item(Ids::MUSIC_DISC_OTHERSIDE, Items::RECORD_OTHERSIDE());
310312
$this->map1to1Item(Ids::MUSIC_DISC_PIGSTEP, Items::RECORD_PIGSTEP());
313+
$this->map1to1Item(Ids::MUSIC_DISC_PRECIPICE, Items::RECORD_PRECIPICE());
314+
$this->map1to1Item(Ids::MUSIC_DISC_RELIC, Items::RECORD_RELIC());
311315
$this->map1to1Item(Ids::MUSIC_DISC_STAL, Items::RECORD_STAL());
312316
$this->map1to1Item(Ids::MUSIC_DISC_STRAD, Items::RECORD_STRAD());
313317
$this->map1to1Item(Ids::MUSIC_DISC_WAIT, Items::RECORD_WAIT());

‎src/item/ItemTypeIds.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,12 @@ private function __construct(){
330330
public const RECOVERY_COMPASS = 20291;
331331
public const PALE_OAK_SIGN = 20292;
332332
public const RESIN_BRICK = 20293;
333+
public const RECORD_RELIC = 20294;
334+
public const RECORD_CREATOR = 20295;
335+
public const RECORD_CREATOR_MUSIC_BOX = 20296;
336+
public const RECORD_PRECIPICE = 20297;
333337

334-
public const FIRST_UNUSED_ITEM_ID = 20294;
338+
public const FIRST_UNUSED_ITEM_ID = 20298;
335339

336340
private static int $nextDynamicId = self::FIRST_UNUSED_ITEM_ID;
337341

‎src/item/StringToItemParser.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,11 +1495,15 @@ private static function registerItems(self $result) : void{
14951495
$result->register("record_blocks", fn() => Items::RECORD_BLOCKS());
14961496
$result->register("record_cat", fn() => Items::RECORD_CAT());
14971497
$result->register("record_chirp", fn() => Items::RECORD_CHIRP());
1498+
$result->register("record_creator", fn() => Items::RECORD_CREATOR());
1499+
$result->register("record_creator_music_box", fn() => Items::RECORD_CREATOR_MUSIC_BOX());
14981500
$result->register("record_far", fn() => Items::RECORD_FAR());
14991501
$result->register("record_mall", fn() => Items::RECORD_MALL());
15001502
$result->register("record_mellohi", fn() => Items::RECORD_MELLOHI());
15011503
$result->register("record_otherside", fn() => Items::RECORD_OTHERSIDE());
15021504
$result->register("record_pigstep", fn() => Items::RECORD_PIGSTEP());
1505+
$result->register("record_precipice", fn() => Items::RECORD_PRECIPICE());
1506+
$result->register("record_relic", fn() => Items::RECORD_RELIC());
15031507
$result->register("record_stal", fn() => Items::RECORD_STAL());
15041508
$result->register("record_strad", fn() => Items::RECORD_STRAD());
15051509
$result->register("record_wait", fn() => Items::RECORD_WAIT());

‎src/item/VanillaItems.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,15 @@
276276
* @method static Record RECORD_BLOCKS()
277277
* @method static Record RECORD_CAT()
278278
* @method static Record RECORD_CHIRP()
279+
* @method static Record RECORD_CREATOR()
280+
* @method static Record RECORD_CREATOR_MUSIC_BOX()
279281
* @method static Record RECORD_FAR()
280282
* @method static Record RECORD_MALL()
281283
* @method static Record RECORD_MELLOHI()
282284
* @method static Record RECORD_OTHERSIDE()
283285
* @method static Record RECORD_PIGSTEP()
286+
* @method static Record RECORD_PRECIPICE()
287+
* @method static Record RECORD_RELIC()
284288
* @method static Record RECORD_STAL()
285289
* @method static Record RECORD_STRAD()
286290
* @method static Record RECORD_WAIT()
@@ -569,11 +573,15 @@ public function isFireProof() : bool{ return true; }
569573
self::register("record_blocks", fn(IID $id) => new Record($id, RecordType::DISK_BLOCKS, "Record Blocks"));
570574
self::register("record_cat", fn(IID $id) => new Record($id, RecordType::DISK_CAT, "Record Cat"));
571575
self::register("record_chirp", fn(IID $id) => new Record($id, RecordType::DISK_CHIRP, "Record Chirp"));
576+
self::register("record_creator", fn(IID $id) => new Record($id, RecordType::DISK_CREATOR, "Record Creator"));
577+
self::register("record_creator_music_box", fn(IID $id) => new Record($id, RecordType::DISK_CREATOR_MUSIC_BOX, "Record Creator (Music Box)"));
572578
self::register("record_far", fn(IID $id) => new Record($id, RecordType::DISK_FAR, "Record Far"));
573579
self::register("record_mall", fn(IID $id) => new Record($id, RecordType::DISK_MALL, "Record Mall"));
574580
self::register("record_mellohi", fn(IID $id) => new Record($id, RecordType::DISK_MELLOHI, "Record Mellohi"));
575581
self::register("record_otherside", fn(IID $id) => new Record($id, RecordType::DISK_OTHERSIDE, "Record Otherside"));
576582
self::register("record_pigstep", fn(IID $id) => new Record($id, RecordType::DISK_PIGSTEP, "Record Pigstep"));
583+
self::register("record_precipice", fn(IID $id) => new Record($id, RecordType::DISK_PRECIPICE, "Record Precipice"));
584+
self::register("record_relic", fn(IID $id) => new Record($id, RecordType::DISK_RELIC, "Record Relic"));
577585
self::register("record_stal", fn(IID $id) => new Record($id, RecordType::DISK_STAL, "Record Stal"));
578586
self::register("record_strad", fn(IID $id) => new Record($id, RecordType::DISK_STRAD, "Record Strad"));
579587
self::register("record_wait", fn(IID $id) => new Record($id, RecordType::DISK_WAIT, "Record Wait"));

0 commit comments

Comments
 (0)