Small audio fix and more

Author: redomar

src/com/redomar/game/Game.java

@@ -394,13 +394,24 @@ public void run() {
 	 * This method updates the logic of the game.
 	 */
 	public void tick() {
+		boolean beforeMusic = musicPlaying;
 		setTickCount(getTickCount() + 1);
-		Either<Exception, Boolean> musicKeyAction = input.toggleActionWithCheckedRunnable(input.getM_KEY(), musicPlaying, () -> Game.getBackgroundMusic().play(), () -> Game.getBackgroundMusic().stop());
+		Either<Exception, Boolean> musicKeyAction = input.toggleActionWithCheckedRunnable(
+				input.getM_KEY(),
+				musicPlaying,
+				() -> Game.getBackgroundMusic().play(),
+				() -> Game.getBackgroundMusic().stop()
+		);
 		musicKeyAction.either(exception -> {
 			printer.cast().print("Failed to play music", PrintTypes.MUSIC);
 			printer.exception(exception.toString());
 			musicPlaying = false;
-		}, isPlaying -> musicPlaying = isPlaying);
+		}, isPlaying -> {
+			musicPlaying = isPlaying;
+			if (musicPlaying && !Game.getBackgroundMusic().getActive()) {
+				input.overWriteKey(input.getM_KEY(), false);
+			}
+		});
 
 		level.tick();
 	}
@@ -498,6 +509,7 @@ public void render() {
 	 */
 	private void status(Graphics2D g, boolean TerminalMode, boolean TerminalQuit) {
 		if (TerminalMode) {
+			new Night(g, screen).render(player.getPlayerAbsX(), player.getPlayerAbsY());
 			// make the background transparent
 			g.setColor(new Color(0, 0, 0, 100));
 			g.fillRect(0, 0, 195, 165);
@@ -532,7 +544,7 @@ private void status(Graphics2D g, boolean TerminalMode, boolean TerminalQuit) {
 			g.drawLine(0, getHeight()/2-8, getWidth(), getHeight()/2-8);
 			g.setColor(Color.yellow);
 			g.fillRect(player.getPlayerAbsX(), player.getPlayerAbsY(), 1, 1);
-			new Night(g, screen).render(player.getPlayerAbsX(), player.getPlayerAbsY());
+
 
 		}
 		// If the game is shutting off

src/com/redomar/game/audio/AudioHandler.java

@@ -45,11 +45,11 @@ private void check(String path) {
 	}
 
 	/**
-	 * Initialises an audio clip from the specified file path.
+	 * Initialises an audio clip by loading an audio file from the specified path. This method sets up the audio stream and prepares the clip for playback.
 	 *
-	 * @param path the file path of the audio clip
+	 * @param path the relative file path to the audio clip resource. The path must be accessible from the classpath and should not be null.
 	 */
-	private void initiate(String path) {
+	private void initiate(@NotNull String path) {
 		try {
 			InputStream inputStream = new BufferedInputStream(Objects.requireNonNull(AudioHandler.class.getResourceAsStream(path)));
 			AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(inputStream);
@@ -59,6 +59,12 @@ private void initiate(String path) {
 			AudioInputStream decodedAudioInputStream = AudioSystem.getAudioInputStream(decodeFormat, audioInputStream);
 			clip = AudioSystem.getClip();
 			clip.open(decodedAudioInputStream);
+			clip.addLineListener(event -> {
+				if (event.getType() == LineEvent.Type.STOP) {
+					stop();
+				}
+			});
+
 		} catch (IOException e) {
 			musicPrinter.cast().exception("Audio file not found " + path);
 			musicPrinter.cast().exception(e.getMessage());
@@ -93,18 +99,19 @@ public void stop() {
 			if (clip == null) throw new RuntimeException("Empty clip");
 			if (clip.isRunning()) {
 				clip.stop();
-				clip.close();
+				if (!music) clip.close();
 			}
+			if (music & active) musicPrinter.print("Stopping Music");
 		} catch (Exception e) {
 			musicPrinter.print("Audio Handler Clip not found");
 		} finally {
-			if (music) musicPrinter.print("Stopping Music");
 			active = false;
 		}
 	}
 
 	public void close() {
 		stop();
+		clip.close();
 	}
 
 	public boolean getActive() {

src/com/redomar/game/entities/Player.java

@@ -35,13 +35,13 @@ public void tick() {
 		double ya = 0;
 
 		// Calculate and set player's absolute X and Y positions
-		setPlayerAbsX((int) ((getX() - Game.getScreen().getxOffset()) * 2) + 8);
-		setPlayerAbsY((int) ((getY() - Game.getScreen().getyOffset()) * 2) + 7);
+		setPlayerAbsX((((int) getX() - Game.getScreen().getxOffset()) * 2) + 8);
+		setPlayerAbsY((((int) getY() - Game.getScreen().getyOffset()) * 2) + 7);
 
 
 		if (inputHandler != null) {
 
-			speed = inputHandler.getSHIFTED().isPressed() ? 2 : 1;
+			speed = inputHandler.getSHIFTED().isPressed() ? 2.5D : 1D;
 
 			if (inputHandler.getUP_KEY().isPressed()) {
 				ya -= speed;

src/com/redomar/game/event/InputHandler.java

@@ -133,6 +133,10 @@ private void toggleKey(int keyCode, boolean isPressed) {
 
 	}
 
+	public void overWriteKey(KeyHandler key, boolean isPressed) {
+		key.setPressedToggle(isPressed);
+	}
+
 	private void quitGame() {
 		Game.setClosing(true);
 		try {