diff options
| author | Phoebe <77941535+catgirlseraid@users.noreply.github.com> | 2024-06-01 00:16:43 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 22:16:43 +1000 |
| commit | 320e81be1fdffba4f7f6373c8ef4a4778c10d65d (patch) | |
| tree | bd9d634bc14462d44afa2bbebed71e351727a2eb /src/main/java | |
| parent | 9b69eb0d5cb268abbd52350d1e4aabb067f2e010 (diff) | |
| download | NotEnoughUpdates-320e81be1fdffba4f7f6373c8ef4a4778c10d65d.tar.gz NotEnoughUpdates-320e81be1fdffba4f7f6373c8ef4a4778c10d65d.tar.bz2 NotEnoughUpdates-320e81be1fdffba4f7f6373c8ef4a4778c10d65d.zip | |
Add more detail to hoppity pv page (#1160)
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: SeRaid <77941535+SeRaid743@users.noreply.github.com>
Co-authored-by: nopo <nopotheemail@gmail.com>
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java | 2 | ||||
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java index 68a34d02..341cf7c6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java @@ -707,7 +707,7 @@ public class GuiProfileViewer extends GuiScreen { Utils.drawItemStack(stack, x + 6, y + 9); } - private static String getDisplayName() { + public static String getDisplayName() { return Utils.getElementOrDefault( profile.getHypixelProfile(), "displayname", diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java index a99c6e0f..6da37043 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/data/APIDataJson.java @@ -258,15 +258,17 @@ public class APIDataJson { public @Nullable JsonObject rabbits; public @Nullable EmployeeData employees; public @Nullable TimeTowerData time_tower; + public @Nullable HoppityShoppity shop; public long chocolate = 0; public long chocolate_since_prestige = 0; public long total_chocolate = 0; - public int click_upgrades = 1; + public int click_upgrades = 0; public int chocolate_level = 1; public int chocolate_multiplier_upgrades = 0; public int rabbit_barn_capacity_level = 1; public int rabbit_rarity_upgrades = 0; + public long last_viewed_chocolate_factory = 0; public static class EmployeeData { public int rabbit_bro = 0; @@ -274,10 +276,18 @@ public class APIDataJson { public int rabbit_sis = 0; public int rabbit_father = 0; public int rabbit_grandma = 0; + public int rabbit_uncle = 0; + public int rabbit_dog = 0; } public static class TimeTowerData { public int level = 0; + public int charges = 0; + public long last_charge_time = 0; + public long activation_time = 0; + } + public static class HoppityShoppity { + public long chocolate_spent = 0; } } } |