aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-07-13 15:27:06 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-07-26 00:59:48 -0400
commit050e3c76ab1b86de365bbab8207cd02043963ad2 (patch)
tree0dcdb88f9f70a518ecbd614451d7edb4f0fe7ee6 /src/main/java
parent9ddc3fe9a52efcbd32e7671a4070ea0a371b5570 (diff)
downloadSkyblocker-050e3c76ab1b86de365bbab8207cd02043963ad2.tar.gz
Skyblocker-050e3c76ab1b86de365bbab8207cd02043963ad2.tar.bz2
Skyblocker-050e3c76ab1b86de365bbab8207cd02043963ad2.zip
Deduplicate timestamp code
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/ObtainedDateTooltip.java14
1 files changed, 2 insertions, 12 deletions
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();
}
}