Motschen/PictureSign
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/PictureSign.git synced 2025-12-13 12:55:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Java 17

Browse Source
This commit is contained in:
Martin Prokoph
2024-07-03 15:09:31 +02:00
parent e13a5ad978
commit 68f2d026ec
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -58,7 +58,7 @@ allprojects {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = "UTF-8" options.encoding = "UTF-8"
options.release = 21 options.release = 17
} }
ext { ext {
releaseChangelog = { releaseChangelog = {

6
common/src/main/java/eu/midnightdust/picturesign/util/MediaHandler.java
View File

@@ -3,6 +3,7 @@ package eu.midnightdust.picturesign.util;
import eu.midnightdust.picturesign.config.PictureSignConfig; import eu.midnightdust.picturesign.config.PictureSignConfig;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import java.util.HashMap; import java.util.HashMap;
@@ -43,7 +44,7 @@ public abstract class MediaHandler {
return; return;
} }
double distance = this.pos.getSquaredDistance(playerPos) / PictureSignConfig.audioDistanceMultiplier; 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) {} void setVolume(int volume) {}
public void setMaxVolume(int volume) { public void setMaxVolume(int volume) {
@@ -53,7 +54,8 @@ public abstract class MediaHandler {
public void closePlayer() {} public void closePlayer() {}
public static void closePlayer(Identifier videoId) { 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() { public static void closeAll() {
mediaHandlers.forEach(((id, player) -> player.closePlayer())); mediaHandlers.forEach(((id, player) -> player.closePlayer()));