From 050e3c76ab1b86de365bbab8207cd02043963ad2 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sat, 13 Jul 2024 15:27:06 -0400
Subject: Deduplicate timestamp code

---
 .../skyblock/item/tooltip/adders/ObtainedDateTooltip.java  | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ObtainedDateTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ObtainedDateTooltip.java
index e7e79966..341ec0fe 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ObtainedDateTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ObtainedDateTooltip.java
@@ -12,6 +12,7 @@ import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
@@ -77,17 +78,6 @@ public class ObtainedDateTooltip extends SimpleTooltipAdder {
 	 * @see #getTimestamp(ItemStack)
 	 */
 	public static long getLongTimestamp(ItemStack stack) {
-		NbtCompound customData = ItemUtils.getCustomData(stack);
-
-		if (customData != null && customData.contains("timestamp", NbtElement.LONG_TYPE)) {
-			return customData.getLong("timestamp");
-		}
-
-		if (customData != null && customData.contains("timestamp", NbtElement.STRING_TYPE)) {
-			TemporalAccessor date = OLD_OBTAINED_DATE_FORMAT.parse(customData.getString("timestamp"));
-			return Instant.from(date).toEpochMilli();
-		}
-
-		return 0L;
+		return LocalDate.parse(getTimestamp(stack), OBTAINED_DATE_FORMATTER).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
 	}
 }
-- 
cgit