From 68f2d026ec26a45fd1b2f5bd11397cefee2b6e8c Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Wed, 3 Jul 2024 15:09:31 +0200
Subject: [PATCH] Fix Java 17

---
 build.gradle                                                | 2 +-
 .../java/eu/midnightdust/picturesign/util/MediaHandler.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 00ffda0..b82e84b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ allprojects {
 
 	tasks.withType(JavaCompile) {
 		options.encoding = "UTF-8"
-		options.release = 21
+		options.release = 17
 	}
 	ext {
 		releaseChangelog = {
diff --git a/common/src/main/java/eu/midnightdust/picturesign/util/MediaHandler.java b/common/src/main/java/eu/midnightdust/picturesign/util/MediaHandler.java
index 38c1977..4e5175e 100644
--- a/common/src/main/java/eu/midnightdust/picturesign/util/MediaHandler.java
+++ b/common/src/main/java/eu/midnightdust/picturesign/util/MediaHandler.java
@@ -3,6 +3,7 @@ package eu.midnightdust.picturesign.util;
 import eu.midnightdust.picturesign.config.PictureSignConfig;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 
 import java.util.HashMap;
@@ -43,7 +44,7 @@ public abstract class MediaHandler {
             return;
         }
         double distance = this.pos.getSquaredDistance(playerPos) / PictureSignConfig.audioDistanceMultiplier;
-        setVolume((int) Math.clamp(maxVolume-distance, 0, 100));
+        setVolume((int) MathHelper.clamp(maxVolume-distance, 0, 100));
     }
     void setVolume(int volume) {}
     public void setMaxVolume(int volume) {
@@ -53,7 +54,8 @@ public abstract class MediaHandler {
     public void closePlayer() {}
 
     public static void closePlayer(Identifier videoId) {
-        if (mediaHandlers.get(videoId) instanceof MediaHandler mediaHandler) mediaHandler.closePlayer();
+        MediaHandler mediaHandler = mediaHandlers.getOrDefault(videoId, null);
+        if (mediaHandler != null) mediaHandler.closePlayer();
     }
     public static void closeAll() {
         mediaHandlers.forEach(((id, player) -> player.closePlayer()));