1.5.2v release

This commit is contained in:
sharlottes
2021-11-12 13:38:16 +09:00
parent 95f35ea40e
commit e8bb78502d
14 changed files with 1300 additions and 1268 deletions

View File

@@ -39,8 +39,6 @@ public class Main extends Mod {
Events.on(ClientLoadEvent.class, e -> {
new SettingS().init();
hud = new HudUi();
hud.addWaveTable();
hud.addUnitTable();
hud.addTable();
hud.addWaveInfoTable();
hud.addSchemTable();
@@ -48,68 +46,5 @@ public class Main extends Mod {
OverDrawer.setEvent();
if(jsonGen) ContentJSON.save();
});
Events.on(WorldLoadEvent.class, e -> {
hud = new HudUi();
hud.addWaveTable();
});
Events.on(WaveEvent.class, e -> {
Vars.ui.hudGroup.removeChild(hud.waveTable);
hud = new HudUi();
hud.addWaveTable();
});
Events.run(Trigger.update, () -> {
if((input.keyDown(KeyCode.shiftRight) || input.keyDown(KeyCode.shiftLeft))){
if(input.keyTap(KeyCode.h)) {
mmid_playMusicSeq(mmid_parseMusicString(Fi.get("C:/Users/user/Desktop/test/output.txt").readString()), null);
};
if(input.keyTap(KeyCode.c)) {
schedules.each(Timer.Task::cancel);
}
}
});
}
Seq<Float[]> mmid_parseMusicString(String s) {
String[] notes = s.split(";");
Seq<Float[]> output = new Seq();
for (String value : notes) {
String[] note = value.split(",");
if (note.length > 0) {
output.add(new Float[]{
Float.parseFloat(note[0]),
(note.length < 2 || note[1] == null) ? 0 : Float.parseFloat(note[1]),
(note.length < 3 || note[2] == null) ? 0 : Float.parseFloat(note[2]),
(note.length < 4 || note[3] == null) ? 1 : Float.parseFloat(note[3]),
(note.length < 5 || note[4] == null) ? 0 : Float.parseFloat(note[4])
});
}
}
Log.info(output);
return output;
};
Seq<Timer.Task> schedules = new Seq<>();
void mmid_playMusicSeq(Seq<Float[]> s, @Nullable Player p) {
Object[][] mmid_instruments = { //Sound, pitch, volume
{Sounds.minebeam, 0.98f, 20f},
{Sounds.minebeam, 2.2f, 0.5f}};
s.each(n-> {
schedules.add(Timer.schedule(() -> {
Log.info(mmid_instruments[n[2].intValue()][0].toString() + " sound is called");
if(p == null || p.con == null) Call.sound(
(Sound)mmid_instruments[n[2].intValue()][0],
n[3]*(float)mmid_instruments[n[2].intValue()][2],
(float)mmid_instruments[n[2].intValue()][1]*(float)Math.pow(1.0595,n[1]), n[4]);
else Call.sound(p.con,
(Sound)mmid_instruments[n[2].intValue()][0],
n[3]*(float)mmid_instruments[n[2].intValue()][2],
(float)mmid_instruments[n[2].intValue()][1]*1f*(float)Math.pow(1.0595,n[1]), n[4]);
},n[0]));
Log.info("start sound after" + n[0] + "sec");
});
}
}