Skip to content

Commit 859aa11

Browse files
authored
Add 1.20.0 support (CloudburstMC#2118)
* Initial 1.20.0 support * Fix creative inventory RIDs
1 parent fc076e8 commit 859aa11

16 files changed

+12001
-10594
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

src/main/java/cn/nukkit/blockentity/BlockEntityJukebox.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ public void play() {
9191
case Item.RECORD_OTHERSIDE:
9292
this.getLevel().addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_RECORD_OTHERSIDE);
9393
break;
94+
case Item.RECORD_5:
95+
this.getLevel().addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_RECORD_5);
96+
break;
97+
case Item.RECORD_RELIC:
98+
this.getLevel().addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_RECORD_RELIC);
99+
break;
94100
}
95101
}
96102
}

src/main/java/cn/nukkit/item/Item.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ public static void init() {
302302
list[RECORD_STRAD] = ItemRecordStrad.class; //508
303303
list[RECORD_WAIT] = ItemRecordWait.class; //511
304304
list[SHIELD] = ItemShield.class; //513
305+
list[RECORD_5] = ItemRecord5.class; //643
306+
list[RECORD_RELIC] = ItemRecordRelic.class; //701
305307
list[SUSPICIOUS_STEW] = ItemSuspiciousStew.class; //734
306308
list[HONEYCOMB] = ItemHoneycomb.class; //736
307309
list[HONEY_BOTTLE] = ItemHoneyBottle.class; //737

src/main/java/cn/nukkit/item/ItemID.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public interface ItemID {
7979
int SIGN = 323;
8080
int WOODEN_DOOR = 324;
8181
int BUCKET = 325;
82-
8382
int MINECART = 328;
8483
int SADDLE = 329;
8584
int IRON_DOOR = 330;
@@ -99,7 +98,6 @@ public interface ItemID {
9998
int SLIMEBALL = 341;
10099
int CHEST_MINECART = 342;
101100
int MINECART_WITH_CHEST = 342;
102-
103101
int EGG = 344;
104102
int COMPASS = 345;
105103
int FISHING_ROD = 346;
@@ -203,21 +201,16 @@ public interface ItemID {
203201
int CHORUS_FRUIT = 432;
204202
int POPPED_CHORUS_FRUIT = 433;
205203
int BANNER_PATTERN = 434;
206-
207204
int DRAGON_BREATH = 437;
208205
int SPLASH_POTION = 438;
209-
210206
int LINGERING_POTION = 441;
211-
212207
int COMMAND_BLOCK_MINECART = 443;
213208
int ELYTRA = 444;
214209
int SHULKER_SHELL = 445;
215210
int BANNER = 446;
216211
int TOTEM = 450;
217212
int IRON_NUGGET = 452;
218-
219213
int TRIDENT = 455;
220-
221214
int BEETROOT = 457;
222215
int BEETROOT_SEEDS = 458;
223216
int BEETROOT_SEED = 458;
@@ -234,9 +227,7 @@ public interface ItemID {
234227
int TURTLE_SHELL = 469;
235228
int PHANTOM_MEMBRANE = 470;
236229
int CROSSBOW = 471;
237-
238230
int SWEET_BERRIES = 477;
239-
240231
int RECORD_13 = 500;
241232
int RECORD_CAT = 501;
242233
int RECORD_BLOCKS = 502;
@@ -249,14 +240,12 @@ public interface ItemID {
249240
int RECORD_WARD = 509;
250241
int RECORD_11 = 510;
251242
int RECORD_WAIT = 511;
252-
253243
int SHIELD = 513;
254-
244+
int RECORD_5 = 643;
245+
int RECORD_RELIC = 701;
255246
int SUSPICIOUS_STEW = 734;
256-
257247
int HONEYCOMB = 736;
258248
int HONEY_BOTTLE = 737;
259-
260249
int LODESTONECOMPASS = 741;
261250
int NETHERITE_INGOT = 742;
262251
int NETHERITE_SWORD = 743;
@@ -269,11 +258,8 @@ public interface ItemID {
269258
int NETHERITE_LEGGINGS = 750;
270259
int NETHERITE_BOOTS = 751;
271260
int NETHERITE_SCRAP = 752;
272-
273261
int WARPED_FUNGUS_ON_A_STICK = 757;
274-
275262
int RECORD_PIGSTEP = 759;
276-
277263
int SPYGLASS = 772;
278264
int RECORD_OTHERSIDE = 773;
279265
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemRecord5 extends ItemRecord {
4+
5+
public ItemRecord5() {
6+
this(0, 1);
7+
}
8+
9+
public ItemRecord5(Integer meta) {
10+
this(meta, 1);
11+
}
12+
13+
public ItemRecord5(Integer meta, int count) {
14+
super(RECORD_5, meta, count);
15+
}
16+
17+
@Override
18+
public String getSoundId() {
19+
return "record.5";
20+
}
21+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package cn.nukkit.item;
2+
3+
public class ItemRecordRelic extends ItemRecord {
4+
5+
public ItemRecordRelic() {
6+
this(0, 1);
7+
}
8+
9+
public ItemRecordRelic(Integer meta) {
10+
this(meta, 1);
11+
}
12+
13+
public ItemRecordRelic(Integer meta, int count) {
14+
super(RECORD_RELIC, meta, count);
15+
}
16+
17+
@Override
18+
public String getSoundId() {
19+
return "record.relic";
20+
}
21+
}

0 commit comments

Comments
 (0)