From 6f20bee15ba0a62946107693d99380efe6aee7f8 Mon Sep 17 00:00:00 2001
From: "sigonasr2, Sig, Sigo" <sigonasr2@gmail.com>
Date: Thu, 14 Oct 2021 06:39:43 +0000
Subject: [PATCH] Make sure notes are sorted when building charts. Make a clap
 sound when previewing in the editor.

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 LLSIG/src/main/java/LLSIG/LLSIG.java | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/LLSIG/src/main/java/LLSIG/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java
index 90d1399..3571763 100644
--- a/LLSIG/src/main/java/LLSIG/LLSIG.java
+++ b/LLSIG/src/main/java/LLSIG/LLSIG.java
@@ -142,6 +142,22 @@ public class LLSIG implements KeyListener{
 					if (PLAYING&&EDITOR) {
 						if (!musicPlayer.isPaused()) {
 							EDITOR_CURSOR_BEAT = (musicPlayer.getPlayPosition()-offset)/beatDelay;
+							for (int i=0;i<9;i++) {
+								Lane lane = LLSIG.game.lanes.get(i);
+								if (lane.noteExists()) {
+									Note n = lane.getNote();
+									if (n.getNoteType()==NoteType.HOLD&&n.active2&&n.getBeatSnapEnd()<=EDITOR_CURSOR_BEAT) {
+										clap.setFramePosition(0);
+										clap.start();
+										n.active2=false;
+									} else
+									if (n.getBeatSnap()<=EDITOR_CURSOR_BEAT) {
+										clap.setFramePosition(0);
+										clap.start();
+										n.active=false;
+									}
+								}
+							}
 						}
 					}
 					canvas.update();
@@ -306,7 +322,17 @@ public class LLSIG implements KeyListener{
 				case KeyEvent.VK_K:{lane=6;}break;
 				case KeyEvent.VK_L:{lane=7;}break;
 				case KeyEvent.VK_SEMICOLON:{lane=8;}break;
-				case KeyEvent.VK_P:{if (LLSIG.game.PLAYING&&musicPlayer.isPaused()) {musicPlayer.seek((long)(Math.floor(EDITOR_CURSOR_BEAT*beatDelay)));PREVIOUS_CURSOR_BEAT=EDITOR_CURSOR_BEAT;musicPlayer.resume();} else {musicPlayer.pause();EDITOR_CURSOR_BEAT=PREVIOUS_CURSOR_BEAT;}}break;
+				case KeyEvent.VK_P:{if (LLSIG.game.PLAYING&&musicPlayer.isPaused()) {
+					musicPlayer.seek((long)(Math.floor(EDITOR_CURSOR_BEAT*beatDelay)));
+					PREVIOUS_CURSOR_BEAT=EDITOR_CURSOR_BEAT;
+					LLSIG.game.lanes.forEach((l)->{
+							l.noteChart.forEach((note)->{
+								note.active = note.getBeatSnap()>EDITOR_CURSOR_BEAT;
+								note.active2 = note.getBeatSnapEnd()>EDITOR_CURSOR_BEAT;
+						});
+					});
+					musicPlayer.resume();
+				} else {musicPlayer.pause();EDITOR_CURSOR_BEAT=PREVIOUS_CURSOR_BEAT;}}break;
 				case KeyEvent.VK_Q:{if (LLSIG.game.PLAYING) {musicPlayer.pause();SaveSongData(song,lanes);}}break;
 				case KeyEvent.VK_DOWN:{EDITOR_CURSOR_BEAT+=1d/EDITOR_BEAT_DIVISIONS;}break;
 				case KeyEvent.VK_RIGHT:{EDITOR_BEAT_DIVISIONS=Math.max(EDITOR_BEAT_DIVISIONS*2,1);EDITOR_CURSOR_BEAT=Math.floor(EDITOR_CURSOR_BEAT*EDITOR_BEAT_DIVISIONS)/EDITOR_BEAT_DIVISIONS;}break;
@@ -371,7 +397,7 @@ public class LLSIG implements KeyListener{
 					n.active=false;
 					//System.out.println(Math.round(((musicPlayer.getPlayPosition()-offset)/beatDelay)*NOTE_RECORD_BEAT_SNAP_MULTIPLE)/(double)NOTE_RECORD_BEAT_SNAP_MULTIPLE);
 					n.setBeatSnap(EDITOR_CURSOR_BEAT);
-					LLSIG.game.lanes.get(lane).addNote(n);
+					LLSIG.game.lanes.get(lane).addNote(n,true);
 					LLSIG.game.lanes.get(lane).lastNoteAdded=n;
 				}
 			} else