aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/item
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-03 16:51:10 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2024-04-26 16:23:20 -0400
commit87fec063614292700954ce5fa3c73de075b56b58 (patch)
tree8a2e5e9043f3cf544aad04acd13f0cbc161a89f2 /src/main/java/de/hysky/skyblocker/skyblock/item
parent9305b5cb8bc483e4d4585fed46ef697cda76e033 (diff)
downloadSkyblocker-87fec063614292700954ce5fa3c73de075b56b58.tar.gz
Skyblocker-87fec063614292700954ce5fa3c73de075b56b58.tar.bz2
Skyblocker-87fec063614292700954ce5fa3c73de075b56b58.zip
24w14a & Java 21
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/item')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java4
2 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java b/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
index 2a1688fc..da832164 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/PlayerHeadHashCache.java
@@ -1,7 +1,6 @@
package de.hysky.skyblocker.skyblock.item;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
import java.util.Base64;
import java.util.concurrent.CompletableFuture;
@@ -50,8 +49,8 @@ public class PlayerHeadHashCache {
//From MinecraftProfileTexture#getHash
public static String getSkinHash(String url) {
try {
- return FilenameUtils.getBaseName(new URL(url).getPath());
- } catch (MalformedURLException e) {
+ return FilenameUtils.getBaseName(new URI(url).getPath());
+ } catch (Exception e) {
LOGGER.error("[Skyblocker Player Head Hash Cache] Malformed Skin URL! URL: {}", url, e);
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 855a4760..94153c01 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -12,7 +12,7 @@ import de.hysky.skyblocker.utils.Utils;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
import it.unimi.dsi.fastutil.Pair;
import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.item.TooltipContext;
+import net.minecraft.client.item.TooltipType;
import net.minecraft.component.type.DyedColorComponent;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
@@ -34,7 +34,7 @@ public class ItemTooltip {
protected static final SkyblockerConfig.ItemTooltip config = SkyblockerConfigManager.get().general.itemTooltip;
private static volatile boolean sentNullWarning = false;
- public static void getTooltip(ItemStack stack, TooltipContext context, List<Text> lines) {
+ public static void getTooltip(ItemStack stack, TooltipType context, List<Text> lines) {
if (!Utils.isOnSkyblock() || client.player == null) return;
String name = getInternalNameFromNBT(stack, false);