diff options
| author | Madeleaan <70163122+Madeleaan@users.noreply.github.com> | 2024-07-06 15:07:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 15:07:47 +0200 |
| commit | fbc6a87600fcc06bdbabacf3dc34ce7261ab6c7c (patch) | |
| tree | f0914ad7357cbea329a49f14ef42acc571e91025 /src/main/java/io/github/moulberry/notenoughupdates/util | |
| parent | 8f5c2b8e0f2756356dfcbfbdaafceb13b1be3d35 (diff) | |
| download | notenoughupdates-fbc6a87600fcc06bdbabacf3dc34ce7261ab6c7c.tar.gz notenoughupdates-fbc6a87600fcc06bdbabacf3dc34ce7261ab6c7c.tar.bz2 notenoughupdates-fbc6a87600fcc06bdbabacf3dc34ce7261ab6c7c.zip | |
Add gemstone stats (#1210)
Co-authored-by: nopo <nopotheemail@gmail.com>
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/util')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java | 4 | ||||
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java index a9cfb09b..0b3abb0c 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 NotEnoughUpdates contributors + * Copyright (C) 2022-2024 NotEnoughUpdates contributors * * This file is part of NotEnoughUpdates. * @@ -86,6 +86,7 @@ public class Constants { public static JsonObject BESTIARY; public static JsonObject SACKS; public static JsonObject HOPPITY; + public static JsonObject GEMSTONES; private static final ReentrantLock lock = new ReentrantLock(); @@ -115,6 +116,7 @@ public class Constants { BESTIARY = Utils.getConstant("bestiary", gson); SACKS = Utils.getConstant("sacks", gson); HOPPITY = Utils.getConstant("hoppity", gson); + GEMSTONES = Utils.getConstant("gemstones", gson); parseEssenceCosts(); } catch (Exception ex) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java index c013ba06..0f67edb4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java @@ -396,7 +396,7 @@ public class ItemUtils { NBTTagCompound display = tag.getCompoundTag("display"); if (display.hasKey("Lore", 9)) { NBTTagList lore = display.getTagList("Lore", 8); - if (Utils.cleanColour(lore.getStringTagAt(0)).matches(ItemTooltipListener.petToolTipRegex) && + if (ItemTooltipListener.petToolTipRegex.matcher(Utils.cleanColour(lore.getStringTagAt(0))).matches() && lore.tagCount() > 7) { PetLeveling.PetLevel petLevel; @@ -412,8 +412,11 @@ public class ItemUtils { int maxLvl = 100; if (Constants.PETS != null && Constants.PETS.has("custom_pet_leveling") && Constants.PETS.getAsJsonObject("custom_pet_leveling").has(pet.petType.toUpperCase(Locale.ROOT)) && - Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(pet.petType.toUpperCase(Locale.ROOT)).has( - "max_level")) { + Constants.PETS + .getAsJsonObject("custom_pet_leveling") + .getAsJsonObject(pet.petType.toUpperCase(Locale.ROOT)) + .has( + "max_level")) { maxLvl = Constants.PETS .getAsJsonObject("custom_pet_leveling") |