From 1a9970a8f1d6fc140c2dc70238415508d2b37c1f Mon Sep 17 00:00:00 2001
From: hama <hama@hama.industries>
Date: Thu, 28 Nov 2024 22:39:30 -0800
Subject: [PATCH] upload progress

---
 gradle.properties                             |  2 +-
 .../symbolics/division/meret/MeretClient.java | 21 +------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 753bfa9..a03b477 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ minecraft_version=1.21.1
 loader_version=0.16.9
 
 # Mod Properties
-mod_version=5.0.0
+mod_version=5.0.3
 maven_group=symbolics.division.meret
 archives_base_name=meret
 
diff --git a/src/client/java/symbolics/division/meret/MeretClient.java b/src/client/java/symbolics/division/meret/MeretClient.java
index 8667fc2..e7cad14 100644
--- a/src/client/java/symbolics/division/meret/MeretClient.java
+++ b/src/client/java/symbolics/division/meret/MeretClient.java
@@ -44,32 +44,13 @@ public static Music getOverride(LocalPlayer player) {
 			return null;
 		}
 
-		var songTags = songRegistry.getTagNames().toList();
-
-
-//		for (var tag : songTags)  {
-//			Area area = AreaClientData.getClientLevelData().get(tag.location());
-//			if (area != null && area.contains(player))
-//				queue.enqueue(area);
-//		}
-
-//		return null;
-//		if (queue.isEmpty()) return null;
-
-//		songRegistry.getOrCreateTag()
-
-
-
 		// sorry jasmine  (´・ω・`)
 		return songRegistry.getTagNames()
                 .map(tag -> new Pair<>(tag, AreaClientData.getClientLevelData().get(tag.location())))
                 .filter(p -> p.getSecond() != null && p.getSecond().contains(player))
 				.max(Comparator.comparingInt(p -> p.getSecond().getPriority()))
 				.flatMap(p -> songRegistry.getOrCreateTag(p.getFirst()).getRandomElement(player.getRandom()))
-				.map(song -> new Music(song.value().soundEvent(), 10, 10, false))
+				.map(song -> new Music(song.value().soundEvent(), 20 * 3 * 60, 20 * 5 * 60, false))
 				.orElse(null);
-
-//		return new Music(song.value().soundEvent(), 10, 10, false);
-////		return new Music(song.value().soundEvent(), 20 * 3 * 60, 20 * 5  * 60, false);
 	}
 }
\ No newline at end of file