From 61c13167db42e945c87bc5e10e2ae3caf7f306c0 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 11 Aug 2024 16:32:53 -0400 Subject: [PATCH] Fix stuff up + Nw Calc 1.0.0 --- gradle.properties | 2 +- src/main/java/de/hysky/skyblocker/debug/Debug.java | 1 + .../hysky/skyblocker/utils/networth/NetworthDataSuppliers.java | 2 +- .../utils/networth/SkyblockItemMetadataRetriever.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4aa0eff3f1..29af034b13 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,7 @@ occlusionculling_version = 0.0.8-SNAPSHOT ## neu repoparser (https://repo.nea.moe/#/releases/moe/nea/neurepoparser/) repoparser_version = 1.5.0 ## Networth Calculator (https://github.com/AzureAaron/networth-calculator) -networth_calculator_version = 1.0.0-alpha.3 +networth_calculator_version = 1.0.0 # Other Libraries ## JGit (https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit) diff --git a/src/main/java/de/hysky/skyblocker/debug/Debug.java b/src/main/java/de/hysky/skyblocker/debug/Debug.java index 38f50a8901..fff12619e9 100644 --- a/src/main/java/de/hysky/skyblocker/debug/Debug.java +++ b/src/main/java/de/hysky/skyblocker/debug/Debug.java @@ -52,6 +52,7 @@ public static void init() { ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(literal("debug") .then(dumpPlayersCommand()) .then(ItemUtils.dumpHeldItemCommand()) + .then(ItemUtils.dumpHeldItemNetworthCalculationsCommand()) .then(toggleShowingInvisibleArmorStands()) .then(dumpArmorStandHeadTextures()) .then(toggleWebSocketDebug()) diff --git a/src/main/java/de/hysky/skyblocker/utils/networth/NetworthDataSuppliers.java b/src/main/java/de/hysky/skyblocker/utils/networth/NetworthDataSuppliers.java index eadca8bbd9..9980d65b09 100644 --- a/src/main/java/de/hysky/skyblocker/utils/networth/NetworthDataSuppliers.java +++ b/src/main/java/de/hysky/skyblocker/utils/networth/NetworthDataSuppliers.java @@ -13,7 +13,7 @@ public class NetworthDataSuppliers { private static final Logger LOGGER = LogUtils.getLogger(); - private static Object2ObjectMap itemData = Object2ObjectMaps.emptyMap(); + private static Object2ObjectMap itemData = Object2ObjectMaps.emptyMap(); public static void updateSkyblockItemData(JsonArray items) { try { diff --git a/src/main/java/de/hysky/skyblocker/utils/networth/SkyblockItemMetadataRetriever.java b/src/main/java/de/hysky/skyblocker/utils/networth/SkyblockItemMetadataRetriever.java index 29c2f8158f..5cb0644f53 100644 --- a/src/main/java/de/hysky/skyblocker/utils/networth/SkyblockItemMetadataRetriever.java +++ b/src/main/java/de/hysky/skyblocker/utils/networth/SkyblockItemMetadataRetriever.java @@ -37,6 +37,6 @@ private static IntList getCakeBagCakeYears(NbtCompound customData, String itemId } catch (Exception ignored) {} } - return new IntArrayList(); + return IntList.of(); } }