Skip to content

Commit 8422a69

Browse files
committed
Removed Bedrock Edition instrument ids
Bedrock Edition now uses the same ids as Java Edition as of 1.21.60
1 parent 67c2b49 commit 8422a69

File tree

1 file changed

+17
-32
lines changed

1 file changed

+17
-32
lines changed

src/main/java/net/raphimc/noteblocklib/data/MinecraftInstrument.java

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,30 @@
2121

2222
public enum MinecraftInstrument implements Instrument {
2323

24-
HARP(0, 0, 0, "block.note_block.harp"),
25-
BASS(1, 4, 4, "block.note_block.bass"),
26-
BASS_DRUM(2, 1, 1, "block.note_block.basedrum"),
27-
SNARE(3, 2, 2, "block.note_block.snare"),
28-
HAT(4, 3, 3, "block.note_block.hat"),
29-
GUITAR(5, 7, 8, "block.note_block.guitar"),
30-
FLUTE(6, 5, 6, "block.note_block.flute"),
31-
BELL(7, 6, 5, "block.note_block.bell"),
32-
CHIME(8, 8, 7, "block.note_block.chime"),
33-
XYLOPHONE(9, 9, 9, "block.note_block.xylophone"),
34-
IRON_XYLOPHONE(10, 10, 10, "block.note_block.iron_xylophone"),
35-
COW_BELL(11, 11, 11, "block.note_block.cow_bell"),
36-
DIDGERIDOO(12, 12, 12, "block.note_block.didgeridoo"),
37-
BIT(13, 13, 13, "block.note_block.bit"),
38-
BANJO(14, 14, 14, "block.note_block.banjo"),
39-
PLING(15, 15, 15, "block.note_block.pling");
24+
HARP(0, 0, "block.note_block.harp"),
25+
BASS(1, 4, "block.note_block.bass"),
26+
BASS_DRUM(2, 1, "block.note_block.basedrum"),
27+
SNARE(3, 2, "block.note_block.snare"),
28+
HAT(4, 3, "block.note_block.hat"),
29+
GUITAR(5, 7, "block.note_block.guitar"),
30+
FLUTE(6, 5, "block.note_block.flute"),
31+
BELL(7, 6, "block.note_block.bell"),
32+
CHIME(8, 8, "block.note_block.chime"),
33+
XYLOPHONE(9, 9, "block.note_block.xylophone"),
34+
IRON_XYLOPHONE(10, 10, "block.note_block.iron_xylophone"),
35+
COW_BELL(11, 11, "block.note_block.cow_bell"),
36+
DIDGERIDOO(12, 12, "block.note_block.didgeridoo"),
37+
BIT(13, 13, "block.note_block.bit"),
38+
BANJO(14, 14, "block.note_block.banjo"),
39+
PLING(15, 15, "block.note_block.pling");
4040

4141
private final byte nbsId;
4242
private final byte mcId;
43-
private final byte mcbeId;
4443
private final String mcSoundName;
4544

46-
MinecraftInstrument(final int nbsId, final int mcId, final int mcbeId, final String mcSoundName) {
45+
MinecraftInstrument(final int nbsId, final int mcId, final String mcSoundName) {
4746
this.nbsId = (byte) nbsId;
4847
this.mcId = (byte) mcId;
49-
this.mcbeId = (byte) mcbeId;
5048
this.mcSoundName = mcSoundName;
5149
}
5250

@@ -68,15 +66,6 @@ public static MinecraftInstrument fromMcId(final byte mcId) {
6866
return null;
6967
}
7068

71-
public static MinecraftInstrument fromMcbeId(final byte mcbeId) {
72-
for (final MinecraftInstrument instrument : MinecraftInstrument.values()) {
73-
if (instrument.mcbeId == mcbeId) {
74-
return instrument;
75-
}
76-
}
77-
return null;
78-
}
79-
8069
public static MinecraftInstrument fromMcSoundName(final String mcSoundName) {
8170
for (final MinecraftInstrument instrument : MinecraftInstrument.values()) {
8271
if (instrument.mcSoundName.equals(mcSoundName)) {
@@ -94,10 +83,6 @@ public byte mcId() {
9483
return this.mcId;
9584
}
9685

97-
public byte mcbeId() {
98-
return this.mcbeId;
99-
}
100-
10186
public String mcSoundName() {
10287
return this.mcSoundName;
10388
}

0 commit comments

Comments
 (0)