ChomeNS/chipmunkbot
1
0
Fork 0
forked from chipmunkmc/chipmunkbot
Code Pull requests Activity

volume i guess

Browse source
This commit is contained in:
Chipmunk 2023-02-21 17:04:56 -05:00
parent 183c79ca76
commit 73967027e2
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/land/chipmunk/chipmunkbot/plugins/SongPlayer.java
View file

@ -164,7 +164,7 @@ public class SongPlayer extends SessionAdapter {
final double floatingPitch = Math.pow(2, (note.pitch - 12) / 12.0); final double floatingPitch = Math.pow(2, (note.pitch - 12) / 12.0);
client.core().run("execute as @a at @s run playsound " + note.instrument.sound + " record @s ~ ~ ~ 1 " + floatingPitch); client.core().run("execute as @a at @s run playsound " + note.instrument.sound + " record @s ~ ~ ~ " + note.volume + " " + floatingPitch);
} }
} }
} }

15
src/main/java/land/chipmunk/chipmunkbot/song/MidiConverter.java
View file

@ -85,16 +85,17 @@ public class MidiConverter {
else if (sm.getCommand() == NOTE_ON) { else if (sm.getCommand() == NOTE_ON) {
if (sm.getData2() == 0) continue; if (sm.getData2() == 0) continue;
int pitch = sm.getData1(); int pitch = sm.getData1();
int velocity = sm.getData2();
long deltaTick = event.getTick() - prevTick; long deltaTick = event.getTick() - prevTick;
prevTick = event.getTick(); prevTick = event.getTick();
microTime += (mpq/tpq) * deltaTick; microTime += (mpq/tpq) * deltaTick;
Note note; Note note;
if (sm.getChannel() == 9) { if (sm.getChannel() == 9) {
note = getMidiPercussionNote(pitch, microTime); note = getMidiPercussionNote(pitch, velocity, microTime);
} }
else { else {
note = getMidiInstrumentNote(ids[sm.getChannel()], pitch, microTime); note = getMidiInstrumentNote(ids[sm.getChannel()], pitch, velocity, microTime);
} }
if (note != null) { if (note != null) {
song.add(note); song.add(note);
@ -123,7 +124,7 @@ public class MidiConverter {
return song; return song;
} }
public static Note getMidiInstrumentNote(int midiInstrument, int midiPitch, long microTime) { public static Note getMidiInstrumentNote(int midiInstrument, int velocity, int midiPitch, long microTime) {
Instrument instrument = null; Instrument instrument = null;
Instrument[] instrumentList = instrumentMap.get(midiInstrument); Instrument[] instrumentList = instrumentMap.get(midiInstrument);
if (instrumentList != null) { if (instrumentList != null) {
@ -140,19 +141,21 @@ public class MidiConverter {
} }
int pitch = midiPitch-instrument.offset; int pitch = midiPitch-instrument.offset;
float volume = (float) velocity / 127.0f;
long time = microTime / 1000L; long time = microTime / 1000L;
return new Note(instrument, pitch, time); return new Note(instrument, pitch, volume, time);
} }
private static Note getMidiPercussionNote (int midiPitch, long microTime) { private static Note getMidiPercussionNote (int midiPitch, int velocity, long microTime) {
if (percussionMap.containsKey(midiPitch)) { if (percussionMap.containsKey(midiPitch)) {
int noteId = percussionMap.get(midiPitch); int noteId = percussionMap.get(midiPitch);
int pitch = noteId % 25; int pitch = noteId % 25;
float volume = (float) velocity / 127.0f;
Instrument instrument = Instrument.fromId(noteId / 25); Instrument instrument = Instrument.fromId(noteId / 25);
long time = microTime / 1000L; long time = microTime / 1000L;
return new Note(instrument, pitch, time); return new Note(instrument, pitch, volume, time);
} }
return null; return null;
} }

2
src/main/java/land/chipmunk/chipmunkbot/song/NBSConverter.java
View file

@ -177,7 +177,7 @@ public class NBSConverter {
} }
int pitch = key-33; int pitch = key-33;
song.add(new Note(instrument, pitch, getMilliTime(note.tick, tempo))); song.add(new Note(instrument, pitch, (float) note.velocity * (float) layerVolume / 10000f, getMilliTime(note.tick, tempo)));
} }
song.length = song.get(song.size()-1).time + 50; song.length = song.get(song.size()-1).time + 50;

1
src/main/java/land/chipmunk/chipmunkbot/song/Note.java
View file

@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
public class Note implements Comparable<Note> { public class Note implements Comparable<Note> {
public Instrument instrument; public Instrument instrument;
public int pitch; public int pitch;
public float volume;
public long time; public long time;
@Override @Override