aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils
diff options
context:
space:
mode:
authornmccullagh <narhanael64@gmail.com>2024-07-03 20:43:31 +0100
committernmccullagh <narhanael64@gmail.com>2024-07-06 19:01:10 +0100
commit9bce5935109c2922887e282e8fc093b13e49c0a4 (patch)
treea5745322ac1ed2ac10ba8388c4e05ede97e01ff7 /src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils
parentff1d61e162ea1f1fd5e49584d00a3ce1128ff6fc (diff)
downloadSkyblocker-9bce5935109c2922887e282e8fc093b13e49c0a4.tar.gz
Skyblocker-9bce5935109c2922887e282e8fc093b13e49c0a4.tar.bz2
Skyblocker-9bce5935109c2922887e282e8fc093b13e49c0a4.zip
some changes
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/LevelFinder.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/ProfileViewerUtils.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SkullCreator.java)6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SubPageSelectButton.java2
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/LevelFinder.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/LevelFinder.java
index b52fd579..9b0fdfb1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/LevelFinder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/LevelFinder.java
@@ -14,7 +14,8 @@ public class LevelFinder {
this.level = level;
}
- public LevelInfo(int level, double fill) {
+ public LevelInfo(long xp, int level, double fill) {
+ this.xp = xp;
this.level = level;
this.fill = fill;
}
@@ -264,7 +265,7 @@ public class LevelFinder {
} else {
fill = 1.0;
}
- return new LevelInfo(boundaries.get(i).level, fill);
+ return new LevelInfo(xp, boundaries.get(i).level, fill);
}
}
return new LevelInfo(0L, 0);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SkullCreator.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/ProfileViewerUtils.java
index b074952c..dca4dd85 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SkullCreator.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/ProfileViewerUtils.java
@@ -8,10 +8,12 @@ import net.minecraft.component.type.ProfileComponent;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
+import java.text.NumberFormat;
+import java.util.Locale;
import java.util.Optional;
import java.util.UUID;
-public class SkullCreator {
+public class ProfileViewerUtils {
public static ItemStack createSkull(String textureB64) {
ItemStack skull = new ItemStack(Items.PLAYER_HEAD);
try {
@@ -24,4 +26,6 @@ public class SkullCreator {
}
return skull;
}
+
+ public static final NumberFormat COMMA_FORMATTER = NumberFormat.getNumberInstance(Locale.US);
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SubPageSelectButton.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SubPageSelectButton.java
index 4c9dcda4..8398747d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SubPageSelectButton.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/utils/SubPageSelectButton.java
@@ -34,7 +34,7 @@ public class SubPageSelectButton extends ClickableWidget {
@Override
protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
context.fill(this.getX(), this.getY(), this.getX() + 20, this.getY() + 20, Color.BLACK.getRGB());
- context.drawTexture(TEXTURES.get(toggled, isHovered()), this.getX() + 1, this.getY() + 1,0, 0, 18, 18, 18, 18);
+ context.drawTexture(TEXTURES.get(toggled, (mouseX > getX() && mouseX < getX() + 19 && mouseY > getY() && mouseY < getY() + 19)), this.getX() + 1, this.getY() + 1,0, 0, 18, 18, 18, 18);
context.drawItem(ICON, this.getX() + 2, this.getY() + 2);
if ((mouseX > getX() + 1 && mouseX < getX() + 19 && mouseY > getY() + 1 && mouseY < getY() + 19)) {
LoreComponent lore = ICON.get(DataComponentTypes.LORE);