aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java102
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java4
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java29
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java31
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java19
-rw-r--r--src/main/resources/assets/notenoughupdates/pv_basic.pngbin5173 -> 2836 bytes
7 files changed, 89 insertions, 98 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 8d0955bb..f473a56f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -1871,9 +1871,7 @@ public class NEUOverlay extends Gui {
ContainerChest container = (ContainerChest) chest.inventorySlots;
IInventory lower = container.getLowerChestInventory();
String containerName = lower.getDisplayName().getUnformattedText();
- if (containerName.contains(guiName)) {
- wardrobeOpen = true;
- } else wardrobeOpen = false;
+ wardrobeOpen = containerName.contains(guiName);
}
if (guiScreen instanceof GuiInventory) {
wardrobeOpen = false;
@@ -1881,27 +1879,6 @@ public class NEUOverlay extends Gui {
return wardrobeOpen;
}
- private int wardrobePage = -1;
-
- private int getWardrobePage() {
- GuiScreen guiScreen = Minecraft.getMinecraft().currentScreen;
- if (guiScreen instanceof GuiChest) {
- if (isInNamedGui("Wardrobe")) {
- GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen;
- ContainerChest container = (ContainerChest) chest.inventorySlots;
- IInventory lower = container.getLowerChestInventory();
- String containerName = lower.getDisplayName().getUnformattedText();
- try {
- wardrobePage = Integer.parseInt(containerName.substring(10, 11));
- } catch (NumberFormatException e) {
- System.out.println(containerName.charAt(10));
- System.out.println("Did hypixel change the wardrobe string?");
- wardrobePage = -1;
- }
- } else wardrobePage = -1;
- }
- return wardrobePage;
- }
private ItemStack getChestSlotsAsItemStack(int slot) {
GuiScreen guiScreen = Minecraft.getMinecraft().currentScreen;
@@ -1913,61 +1890,13 @@ public class NEUOverlay extends Gui {
}
}
- private int selectedArmor = 9;
-
- private int getEquippedArmor() {
- if (isInNamedGui("Wardrobe")) {
- ItemStack nullTest1 = getChestSlotsAsItemStack(8);
- ItemStack nullTest2 = getChestSlotsAsItemStack(17);
- ItemStack nullTest3 = getChestSlotsAsItemStack(26);
- ItemStack nullTest4 = getChestSlotsAsItemStack(35);
- ItemStack nullTest5 = getChestSlotsAsItemStack(44);
- if (nullTest1 != null || nullTest2 != null || nullTest3 != null || nullTest4 != null || nullTest5 != null) {
- selectedArmor = 9;
- }
- for (int ii = 1; ii < 5; ii++) {
- if (ii == 1 || selectedArmor == 9) {
- if (getWardrobePage() == ii) {
- for (int i = 8; i < 54; i += 9) {
- ItemStack stack1 = getChestSlotsAsItemStack(i);
- if (stack1 != null) {
- String[] lore1 = NotEnoughUpdates.INSTANCE.manager.getLoreFromNBT(stack1.getTagCompound());
- for (String line : lore1) {
- //System.out.println(line);
- if (line.contains("to unequip this armor")) {
- selectedArmor = i;
- break;
- }
- }
- }
- }
- }
- }
- }
- }
- return selectedArmor;
- }
private ItemStack getWardrobeSlot(int armourSlot) {
- if (isInNamedGui("Wardrobe")) {
- if (getChestSlotsAsItemStack(getEquippedArmor() - armourSlot) != null && getEquippedArmor() != 9) {
- return getChestSlotsAsItemStack(getEquippedArmor() - armourSlot);
- } else return null;
+ if (isInNamedGui("Your Equipment")) {
+ return getChestSlotsAsItemStack(armourSlot);
} else return null;
}
- public boolean isWardrobeSystemOnMainServer() {
- JsonElement alphaWardrobeElement = Utils.getElement(Constants.DISABLE, "wardrobeFeature");
- if (alphaWardrobeElement == null || !alphaWardrobeElement.isJsonObject()) {
- return true;
- }
- JsonObject isWardrobe = alphaWardrobeElement.getAsJsonObject();
- if (isWardrobe.has("enableNewWardrob")) {
- return isWardrobe.get("enableNewWardrob").getAsBoolean();
- } else {
- return true;
- }
- }
public ItemStack slot1 = null;
public ItemStack slot2 = null;
@@ -2019,16 +1948,15 @@ public class NEUOverlay extends Gui {
if (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud &&
NotEnoughUpdates.INSTANCE.config.misc.hidePotionEffect
- && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() && isWardrobeSystemOnMainServer()) {
- if (getWardrobeSlot(1) != null) {
- slot1 = getWardrobeSlot(4);
- slot2 = getWardrobeSlot(3);
- slot3 = getWardrobeSlot(2);
- slot4 = getWardrobeSlot(1);
+ && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
+ if (getWardrobeSlot(10) != null) {
+ slot1 = getWardrobeSlot(10);
+ slot2 = getWardrobeSlot(19);
+ slot3 = getWardrobeSlot(28);
+ slot4 = getWardrobeSlot(37);
}
if (guiScreen instanceof GuiInventory) {
renderingArmorHud = true;
- selectedArmor = 9;
List<String> tooltipToDisplay = null;
if (NotEnoughUpdates.INSTANCE.config.customArmour.colourStyle == 0) {
@@ -2070,7 +1998,7 @@ public class NEUOverlay extends Gui {
tooltipToDisplay = Lists.newArrayList(
EnumChatFormatting.RED + "Warning",
- EnumChatFormatting.GREEN + "You need to open /wardrobe",
+ EnumChatFormatting.GREEN + "You need to open /equipment",
EnumChatFormatting.GREEN + "To cache your armour"
);
if (mouseX >= ((width - 208) / 2f) && mouseX < ((width - 208) / 2f) + 16) {
@@ -2078,9 +2006,9 @@ public class NEUOverlay extends Gui {
NotEnoughUpdates.INSTANCE.config.customArmour.sendWardrobeCommand) {
if (Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
if (Mouse.getEventButtonState()) {
- if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/wardrobe") ==
+ if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/equipment") ==
0) {
- NotEnoughUpdates.INSTANCE.sendChatMessage("/wardrobe");
+ NotEnoughUpdates.INSTANCE.sendChatMessage("/equipment");
}
}
}
@@ -2098,9 +2026,9 @@ public class NEUOverlay extends Gui {
NotEnoughUpdates.INSTANCE.config.customArmour.sendWardrobeCommand) {
if (Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
if (Mouse.getEventButtonState()) {
- if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/wardrobe") ==
+ if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/equipment") ==
0) {
- NotEnoughUpdates.INSTANCE.sendChatMessage("/wardrobe");
+ NotEnoughUpdates.INSTANCE.sendChatMessage("/equipment");
}
}
}
@@ -2172,7 +2100,7 @@ public class NEUOverlay extends Gui {
if (guiScreen instanceof GuiInventory) {
GL11.glTranslatef(0, 0, 401);
- if (!NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud || !isWardrobeSystemOnMainServer()) {
+ if (!NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) {
if (NotEnoughUpdates.INSTANCE.config.petOverlay.colourStyle == 0) {
Minecraft.getMinecraft().getTextureManager().bindTexture(PET_DISPLAY);
}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
index 281830c3..6203a36d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
@@ -812,7 +812,7 @@ public class PetInfoOverlay extends TextOverlay {
if (currentTime - lastPetSelect > 500) {
boolean foundDespawn = false;
for (String line : lore) {
- if (line.equals("\u00a77\u00a7cClick to despawn.")) {
+ if (line.startsWith("\u00a77\u00a7cClick to despawn")) {
config.selectedPet = petIndex;
foundDespawn = true;
break;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
index f1b2338f..edfd2276 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java
@@ -17,8 +17,8 @@ public class CustomArmour {
@Expose
@ConfigOption(
- name = "Click To Open Wardrobe",
- desc = "Click on the hud to open /wardrobe"
+ name = "Click To Open equipment menu",
+ desc = "Click on the hud to open /equipment"
)
@ConfigEditorBoolean
public boolean sendWardrobeCommand = true;
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 691ccaae..597b6b4d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.authlib.GameProfile;
+import io.github.moulberry.notenoughupdates.NEUOverlay;
import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
import io.github.moulberry.notenoughupdates.cosmetics.ShaderManager;
import io.github.moulberry.notenoughupdates.itemeditor.GuiElementTextField;
@@ -3325,6 +3326,10 @@ public class GuiProfileViewer extends GuiScreen {
Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.enderman.boss_kills_tier_2"), 0);
float enderman_boss_kills_tier_3 =
Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.enderman.boss_kills_tier_3"), 0);
+ float blaze_boss_kills_tier_2 =
+ Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.blaze.boss_kills_tier_2"), 0);
+ float blaze_boss_kills_tier_3 =
+ Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.blaze.boss_kills_tier_3"), 0);
Utils.renderAlignedString(
EnumChatFormatting.DARK_AQUA + "Revenant T3",
@@ -3390,6 +3395,20 @@ public class GuiProfileViewer extends GuiScreen {
guiTop + yStartBottom + yOffset * 3,
76
);
+ Utils.renderAlignedString(
+ EnumChatFormatting.DARK_AQUA + "Inferno T3",
+ EnumChatFormatting.WHITE.toString() + (int) blaze_boss_kills_tier_2,
+ guiLeft + xStart + xOffset * 2,
+ guiTop + yStartBottom + yOffset * 4,
+ 76
+ );
+ Utils.renderAlignedString(
+ EnumChatFormatting.DARK_AQUA + "Inferno T4",
+ EnumChatFormatting.WHITE.toString() + (int) blaze_boss_kills_tier_3,
+ guiLeft + xStart + xOffset * 2,
+ guiTop + yStartBottom + yOffset * 5,
+ 76
+ );
float pet_milestone_ores_mined =
Utils.getElementAsFloat(Utils.getElement(profileInfo, "stats.pet_milestone_ores_mined"), 0);
@@ -4972,7 +4991,7 @@ public class GuiProfileViewer extends GuiScreen {
Splitter splitter = Splitter.on(" ").omitEmptyStrings().limit(2);
for (int i = 0; i < PlayerStats.defaultStatNames.length; i++) {
String statName = PlayerStats.defaultStatNames[i];
- if (statName.equals("mining_fortune") || statName.equals("mining_speed")) continue;
+ //if (statName.equals("mining_fortune") || statName.equals("mining_speed")) continue;
String statNamePretty = PlayerStats.defaultStatNamesPretty[i];
int val = Math.round(stats.get(statName));
@@ -4989,7 +5008,7 @@ public class GuiProfileViewer extends GuiScreen {
statNamePretty,
EnumChatFormatting.WHITE.toString() + val,
guiLeft + 132,
- guiTop + 27 + 11f * i,
+ guiTop + 21 + 11f * i,
80
);
@@ -5038,8 +5057,8 @@ public class GuiProfileViewer extends GuiScreen {
continue;
}
- int yPosition = position % 7;
- int xPosition = position / 7;
+ int yPosition = position % 8;
+ int xPosition = position / 8;
String skillName = entry.getValue().getDisplayName();
@@ -5047,7 +5066,7 @@ public class GuiProfileViewer extends GuiScreen {
int levelFloored = (int) Math.floor(level);
int x = guiLeft + 237 + 86 * xPosition;
- int y = guiTop + 31 + 21 * yPosition;
+ int y = guiTop + 24 + 21 * yPosition;
Utils.renderAlignedString(skillName, EnumChatFormatting.WHITE.toString() + levelFloored, x + 14, y - 4, 60);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java
index 4a915111..6535a99a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/PlayerStats.java
@@ -33,6 +33,8 @@ public class PlayerStats {
public static final String SEA_CREATURE_CHANCE = "sea_creature_chance";
public static final String MAGIC_FIND = "magic_find";
public static final String PET_LUCK = "pet_luck";
+ public static final String MINING_FORTUNE = "mining_fortune";
+ public static final String MINING_SPEED = "mining_speed";
public static final String[] defaultStatNames = new String[]{
"health",
@@ -245,6 +247,23 @@ public class PlayerStats {
return 0;
}
}
+ private static float hotmFortune(JsonObject profile, JsonObject skillInfo) {
+ int miningLevelFortune =
+ (int) (4 * (float) Math.floor(Utils.getElementAsFloat(Utils.getElement(skillInfo, "level_skill_mining"), 0)));
+ int miningFortuneStat =
+ ((Utils.getElementAsInt(Utils.getElement(profile, "mining_core.nodes.mining_fortune"), 0)) * 5);
+ int miningFortune2Stat =
+ ((Utils.getElementAsInt(Utils.getElement(profile, "mining_core.nodes.mining_fortune_2"), 0)) * 5);
+ return miningFortuneStat + miningFortune2Stat + miningLevelFortune;
+ }
+
+ private static float hotmSpeed(JsonObject profile) {
+ int miningSpeedStat =
+ ((Utils.getElementAsInt(Utils.getElement(profile, "mining_core.nodes.mining_speed"), 0)) * 20);
+ int miningSpeed2Stat =
+ ((Utils.getElementAsInt(Utils.getElement(profile, "mining_core.nodes.mining_speed_2"), 0)) * 40);
+ return miningSpeedStat + miningSpeed2Stat;
+ }
public static Stats getPassiveBonuses(JsonObject skillInfo, JsonObject profile) {
Stats passiveBonuses = new Stats();
@@ -265,6 +284,15 @@ public class PlayerStats {
return passiveBonuses;
}
+ public static Stats getHOTMBonuses(JsonObject skillInfo, JsonObject profile) {
+ Stats hotmBonuses = new Stats();
+
+ hotmBonuses.addStat(MINING_FORTUNE, hotmFortune(profile, skillInfo));
+ hotmBonuses.addStat(MINING_SPEED, hotmSpeed(profile));
+
+ return hotmBonuses;
+ }
+
private static String getFullset(JsonArray armor, int ignore) {
String fullset = null;
for (int i = 0; i < armor.size(); i++) {
@@ -637,6 +665,7 @@ public class PlayerStats {
JsonArray talisman_bag = Utils.getElement(inventoryInfo, "talisman_bag").getAsJsonArray();
Stats passiveBonuses = getPassiveBonuses(skillInfo, profile);
+ Stats hotmBonuses = getHOTMBonuses(skillInfo, profile);
Stats armorBonuses = getItemBonuses(false, armor);
Stats talismanBonuses = getItemBonuses(true, inventory, talisman_bag);
@@ -651,7 +680,7 @@ public class PlayerStats {
Stats petBonus = getPetStatBonuses(petsInfo);
- stats = stats.add(passiveBonuses).add(armorBonuses).add(talismanBonuses).add(petBonus);
+ stats = stats.add(passiveBonuses).add(armorBonuses).add(talismanBonuses).add(petBonus).add(hotmBonuses);
stats.add(getSetBonuses(stats, inventoryInfo, collectionInfo, skillInfo, profile));
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
index 22656b1a..28cdf721 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/ProfileViewer.java
@@ -70,6 +70,7 @@ public class ProfileViewer {
put("slayer_spider", Utils.createItemStack(Items.spider_eye, EnumChatFormatting.GOLD + "Tara Slayer"));
put("slayer_wolf", Utils.createItemStack(Items.bone, EnumChatFormatting.GOLD + "Sven Slayer"));
put("slayer_enderman", Utils.createItemStack(Items.ender_pearl, EnumChatFormatting.GOLD + "Ender Slayer"));
+ put("slayer_blaze", Utils.createItemStack(Items.blaze_rod, EnumChatFormatting.GOLD + "Blaze Slayer"));
}};
private static final ItemStack CAT_FARMING =
Utils.createItemStack(Items.golden_hoe, EnumChatFormatting.YELLOW + "Farming");
@@ -96,7 +97,7 @@ public class ProfileViewer {
));
put(CAT_FORAGING, Utils.createList("LOG", "LOG:1", "LOG:2", "LOG_2:1", "LOG_2", "LOG:3", null));
put(CAT_FISHING, Utils.createList("RAW_FISH", "RAW_FISH:1", "RAW_FISH:2", "RAW_FISH:3", "PRISMARINE_SHARD",
- "PRISMARINE_CRYSTALS", "CLAY_BALL", "WATER_LILY", "INK_SACK", "SPONGE"
+ "PRISMARINE_CRYSTALS", "CLAY_BALL", "WATER_LILY", "INK_SACK", "SPONGE", "MAGMA_FISH"
));
}};
@@ -110,7 +111,7 @@ public class ProfileViewer {
"MITHRIL", "HARD_STONE", null
));
put(CAT_COMBAT, Utils.createList("ZOMBIE", "SKELETON", "SPIDER", "CAVESPIDER", "CREEPER", "ENDERMAN",
- "GHAST", "SLIME", "BLAZE", "MAGMA_CUBE", "REVENANT", "TARANTULA", "VOIDLING"
+ "GHAST", "SLIME", "BLAZE", "MAGMA_CUBE", "REVENANT", "TARANTULA", "VOIDLING", "INFERNO"
));
put(CAT_FORAGING, Utils.createList("OAK", "SPRUCE", "BIRCH", "DARK_OAK", "ACACIA", "JUNGLE", "FLOWER"));
put(CAT_FISHING, Utils.createList("FISHING", null, null, null, null, null, "CLAY", null, null, null));
@@ -238,6 +239,11 @@ public class ProfileViewer {
);
put("INK_SACK", Utils.createItemStack(Items.dye, EnumChatFormatting.AQUA + "Ink Sack"));
put("SPONGE", Utils.createItemStack(Item.getItemFromBlock(Blocks.sponge), EnumChatFormatting.AQUA + "Sponge"));
+ put("MAGMA_FISH",
+ Utils.createSkull(EnumChatFormatting.AQUA + "Magmafish",
+ "5c53195c-5b98-3476-9731-c32647b22723",
+ "ewogICJ0aW1lc3RhbXAiIDogMTY0MjQ4ODA3MDY2NiwKICAicHJvZmlsZUlkIiA6ICIzNDkxZjJiOTdjMDE0MWE2OTM2YjFjMjJhMmEwMGZiNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJKZXNzc3N1aGgiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjU2YjU5NTViMjk1NTIyYzk2ODk0ODE5NjBjMDFhOTkyY2ExYzc3NTRjZjRlZTMxM2M4ZGQwYzM1NmQzMzVmIgogICAgfQogIH0KfQ")
+ );
}};
private static final AtomicBoolean updatingResourceCollection = new AtomicBoolean(false);
private static JsonObject resourceCollection = null;
@@ -867,6 +873,8 @@ public class ProfileViewer {
float experience_slayer_wolf = Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.wolf.xp"), 0);
float experience_slayer_enderman =
Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.enderman.xp"), 0);
+ float experience_slayer_blaze =
+ Utils.getElementAsFloat(Utils.getElement(profileInfo, "slayer_bosses.blaze.xp"), 0);
float totalSkillXP = experience_skill_taming + experience_skill_mining + experience_skill_foraging
+ experience_skill_enchanting + experience_skill_carpentry + experience_skill_farming
@@ -897,6 +905,7 @@ public class ProfileViewer {
skillInfo.addProperty("experience_slayer_spider", experience_slayer_spider);
skillInfo.addProperty("experience_slayer_wolf", experience_slayer_wolf);
skillInfo.addProperty("experience_slayer_enderman", experience_slayer_enderman);
+ skillInfo.addProperty("experience_slayer_blaze", experience_slayer_blaze);
JsonArray levelingArray = Utils.getElement(leveling, "leveling_xp").getAsJsonArray();
int farmingCap = getCap(leveling, "farming") + (int) Utils.getElementAsFloat(
@@ -933,6 +942,9 @@ public class ProfileViewer {
Level level_slayer_enderman = getLevel(Utils.getElement(leveling, "slayer_xp.enderman").getAsJsonArray(),
experience_slayer_enderman, 9, true
);
+ Level level_slayer_blaze = getLevel(Utils.getElement(leveling, "slayer_xp.blaze").getAsJsonArray(),
+ experience_slayer_blaze, 9, true
+ );
skillInfo.addProperty("level_skill_taming", level_skill_taming.level);
skillInfo.addProperty("level_skill_mining", level_skill_mining.level);
@@ -951,6 +963,7 @@ public class ProfileViewer {
skillInfo.addProperty("level_slayer_spider", level_slayer_spider.level);
skillInfo.addProperty("level_slayer_wolf", level_slayer_wolf.level);
skillInfo.addProperty("level_slayer_enderman", level_slayer_enderman.level);
+ skillInfo.addProperty("level_slayer_blaze", level_slayer_blaze.level);
skillInfo.addProperty("maxed_skill_taming", level_skill_taming.maxed);
skillInfo.addProperty("maxed_skill_mining", level_skill_mining.maxed);
@@ -969,6 +982,7 @@ public class ProfileViewer {
skillInfo.addProperty("maxed_slayer_spider", level_slayer_spider.maxed);
skillInfo.addProperty("maxed_slayer_wolf", level_slayer_wolf.maxed);
skillInfo.addProperty("maxed_slayer_enderman", level_slayer_enderman.maxed);
+ skillInfo.addProperty("maxed_slayer_blaze", level_slayer_blaze.maxed);
skillInfo.addProperty("maxxp_skill_taming", level_skill_taming.maxXpForLevel);
skillInfo.addProperty("maxxp_skill_mining", level_skill_mining.maxXpForLevel);
@@ -987,6 +1001,7 @@ public class ProfileViewer {
skillInfo.addProperty("maxxp_slayer_spider", level_slayer_spider.maxXpForLevel);
skillInfo.addProperty("maxxp_slayer_wolf", level_slayer_wolf.maxXpForLevel);
skillInfo.addProperty("maxxp_slayer_enderman", level_slayer_enderman.maxXpForLevel);
+ skillInfo.addProperty("maxxp_slayer_blaze", level_slayer_blaze.maxXpForLevel);
return skillInfo;
}
diff --git a/src/main/resources/assets/notenoughupdates/pv_basic.png b/src/main/resources/assets/notenoughupdates/pv_basic.png
index 227bad5a..4d5236f5 100644
--- a/src/main/resources/assets/notenoughupdates/pv_basic.png
+++ b/src/main/resources/assets/notenoughupdates/pv_basic.png
Binary files differ
generated by cgit (git 2.46.0) at 2024-11-23 16:50:14 +0000