diff options
Diffstat (limited to 'src/main/java/de')
4 files changed, 13 insertions, 10 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java b/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java index 09ce813f..ae1e6deb 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/DrawContextMixin.java @@ -37,7 +37,7 @@ public abstract class DrawContextMixin { if (Utils.isOnSkyblock()) { NbtCompound extraAttributes = ItemUtils.getExtraAttributes(stack); - if (extraAttributes != null && extraAttributes.getString("id").equals("ATTRIBUTE_SHARD")) { + if (extraAttributes != null && extraAttributes.getString(ItemUtils.ID).equals("ATTRIBUTE_SHARD")) { NbtCompound attributesTag = extraAttributes.getCompound("attributes"); String[] attributes = attributesTag.getKeys().toArray(String[]::new); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java index d078de16..e400e205 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -236,10 +236,10 @@ public class PriceInfoTooltip { public static String getInternalNameFromNBT(ItemStack stack, boolean internalIDOnly) { NbtCompound ea = ItemUtils.getExtraAttributes(stack); - if (ea == null || !ea.contains("id", 8)) { + if (ea == null || !ea.contains(ItemUtils.ID, 8)) { return null; } - String internalName = ea.getString("id"); + String internalName = ea.getString(ItemUtils.ID); if (internalIDOnly) { return internalName; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java index 24146c64..badaa57e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java @@ -1,10 +1,11 @@ -package de.hysky.skyblocker.skyblock.itemlist; +package me.xmrvizzy.skyblocker.skyblock.itemlist; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import de.hysky.skyblocker.utils.NEURepo; +import me.xmrvizzy.skyblocker.utils.ItemUtils; +import me.xmrvizzy.skyblocker.utils.NEURepo; import net.minecraft.item.FireworkRocketItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.*; @@ -45,8 +46,8 @@ public class ItemStackBuilder { root.put("tag", tag); NbtCompound extra = new NbtCompound(); - tag.put("ExtraAttributes", extra); - extra.put("id", NbtString.of(internalName)); + tag.put(ItemUtils.EXTRA_ATTRIBUTES, extra); + extra.put(ItemUtils.ID, NbtString.of(internalName)); NbtCompound display = new NbtCompound(); tag.put("display", display); diff --git a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java index c7718cc9..ea861a88 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java +++ b/src/main/java/de/hysky/skyblocker/utils/ItemUtils.java @@ -21,6 +21,8 @@ import java.util.regex.Pattern; public class ItemUtils { private final static Pattern WHITESPACES = Pattern.compile("^\\s*$"); public static final String EXTRA_ATTRIBUTES = "ExtraAttributes"; + public static final String ID = "id"; + public static final String UUID = "uuid"; public static List<Text> getTooltip(ItemStack item) { MinecraftClient client = MinecraftClient.getInstance(); @@ -65,7 +67,7 @@ public class ItemUtils { * @return an optional containing the internal name of the item stack */ public static Optional<String> getItemIdOptional(@NotNull ItemStack stack) { - return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString("id")); + return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString(ID)); } /** @@ -83,7 +85,7 @@ public class ItemUtils { * @return an optional containing the UUID of the item stack */ public static Optional<String> getItemUuidOptional(@NotNull ItemStack stack) { - return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString("uuid")); + return getExtraAttributesOptional(stack).map(extraAttributes -> extraAttributes.getString(UUID)); } /** @@ -101,7 +103,7 @@ public class ItemUtils { return null; } - if (getExtraAttributesOptional(stack).filter(extraAttributes -> extraAttributes.contains("drill_fuel") || extraAttributes.getString("id").equals("PICKONIMBUS")).isEmpty()) { + if (getExtraAttributesOptional(stack).filter(extraAttributes -> extraAttributes.contains("drill_fuel") || extraAttributes.getString(ItemUtils.ID).equals("PICKONIMBUS")).isEmpty()) { return null; } |