diff options
| author | nmccullagh <narhanael64@gmail.com> | 2024-07-30 22:58:25 +0100 |
|---|---|---|
| committer | nmccullagh <narhanael64@gmail.com> | 2024-07-30 22:58:25 +0100 |
| commit | a2a77a0c87e1f91a880a2a67d9ee9533777d6dd4 (patch) | |
| tree | ce4693e85bfb54d80c2f97b102563807eed5ebe0 /src/main/java | |
| parent | 6715d16bd530f972b2ad8dcacc00106ebf3b422f (diff) | |
| download | Skyblocker-a2a77a0c87e1f91a880a2a67d9ee9533777d6dd4.tar.gz Skyblocker-a2a77a0c87e1f91a880a2a67d9ee9533777d6dd4.tar.bz2 Skyblocker-a2a77a0c87e1f91a880a2a67d9ee9533777d6dd4.zip | |
Use Taming Levels Added to API.
Potential fix for active armour inserted into wrong wardrobe slot
Diffstat (limited to 'src/main/java')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java index 9d434726..ba98da26 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/itemLoaders/WardrobeInventoryItemLoader.java @@ -25,9 +25,9 @@ public class WardrobeInventoryItemLoader extends ItemLoader { if (activeSlot != -1) { List<ItemStack> activeArmour = super.loadItems(activeArmorSet).reversed(); for (int i = 0; i < 4; i++) { - int baseIndex = activeSlot % 9; - int page = activeSlot / 9; - int slotIndex = (page * 36) + (i * 9) + baseIndex - 1; + int baseIndex = (activeSlot -1) % 9; + int page = (activeSlot - 1) / 9; + int slotIndex = (page * 36) + (i * 9) + baseIndex; itemList.set(slotIndex, activeArmour.get(i)); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillWidget.java index 51f5e5f4..65c54b49 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillWidget.java @@ -88,8 +88,8 @@ public class SkillWidget { fillColor = Color.MAGENTA; } - if ((SOFT_SKILL_CAP.containsKey(SKILL_NAME) && SKILL_LEVEL.level > SOFT_SKILL_CAP.get(SKILL_NAME)) && SKILL_LEVEL.level < SKILL_CAP.get(SKILL_NAME) && SKILL_LEVEL.fill == 1 || - (SKILL_NAME.equals("Taming") && SKILL_LEVEL.level >= SOFT_SKILL_CAP.get(SKILL_NAME))) { + if ((SOFT_SKILL_CAP.containsKey(SKILL_NAME) && SKILL_LEVEL.level > SOFT_SKILL_CAP.get(SKILL_NAME)) + && SKILL_LEVEL.level < SKILL_CAP.get(SKILL_NAME) && SKILL_LEVEL.fill == 1) { fillColor = Color.YELLOW; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillsPage.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillsPage.java index 952e5620..784da522 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillsPage.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/skills/SkillsPage.java @@ -49,6 +49,7 @@ public class SkillsPage implements ProfileViewerPage { try { return switch (skill) { case "Farming" -> this.PLAYER_PROFILE.getAsJsonObject("jacobs_contest").getAsJsonObject("perks").get("farming_level_cap").getAsInt(); + case "Taming" -> this.PLAYER_PROFILE.getAsJsonObject("pets_data").getAsJsonObject("pet_care").get("pet_types_sacrificed").getAsJsonArray().size(); default -> -1; }; } catch (Exception e) { |