diff options
| author | Linnea Gräf <nea@nea.moe> | 2024-04-12 08:00:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 08:00:46 +0200 |
| commit | 3cd5ec334fb6cbbdf4e44f471c9895cca8db1000 (patch) | |
| tree | ccd1d53894102afbe86e3f9781fa1f6a5b015ea3 /src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java | |
| parent | 810d9c3bdbfc2323bf9ddc76f944e39aa8b86fbf (diff) | |
| download | notenoughupdates-3cd5ec334fb6cbbdf4e44f471c9895cca8db1000.tar.gz notenoughupdates-3cd5ec334fb6cbbdf4e44f471c9895cca8db1000.tar.bz2 notenoughupdates-3cd5ec334fb6cbbdf4e44f471c9895cca8db1000.zip | |
Fix skill experience detection (#1085)
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java index f071c788..3fc89b59 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/FarmingSkillOverlay.java @@ -30,6 +30,7 @@ import io.github.moulberry.notenoughupdates.util.Utils; import io.github.moulberry.notenoughupdates.util.XPInformation; import io.github.moulberry.notenoughupdates.util.hypixelapi.HypixelItemAPI; import lombok.val; +import lombok.var; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -281,9 +282,17 @@ public class FarmingSkillOverlay extends TextOverlay { private void updateSkillInfo() { skillInfoLast = skillInfo; - skillInfo = XPInformation.getInstance().getSkillInfo(skillType); + var s = NotEnoughUpdates.INSTANCE.config.skillOverlays.farmingText; + skillInfo = XPInformation.getInstance().getSkillInfo( + skillType, + s.contains(2) || + s.contains(3) || + s.contains(4) || + s.contains(5) || + s.contains(7) + ); if (skillInfo != null) { - float totalXp = skillInfo.totalXp; + float totalXp = (float) skillInfo.totalXp; if (lastTotalXp > 0) { float delta = totalXp - lastTotalXp; @@ -556,9 +565,9 @@ public class FarmingSkillOverlay extends TextOverlay { .append(EnumChatFormatting.GRAY) .append(" ["); - float progress = skillInfo.currentXp / skillInfo.currentXpMax; + float progress = (float) (skillInfo.currentXp / skillInfo.currentXpMax); if (skillInfoLast != null && skillInfo.currentXpMax == skillInfoLast.currentXpMax) { - progress = interpolate(progress, skillInfoLast.currentXp / skillInfoLast.currentXpMax); + progress = interpolate(progress, (float) (skillInfoLast.currentXp / skillInfoLast.currentXpMax)); } float lines = 25; @@ -579,7 +588,7 @@ public class FarmingSkillOverlay extends TextOverlay { int current = (int) skillInfo.currentXp; if (skillInfoLast != null && skillInfo.currentXpMax == skillInfoLast.currentXpMax) { - current = (int) interpolate(current, skillInfoLast.currentXp); + current = (int) interpolate(current, (float) skillInfoLast.currentXp); } int remaining = (int) (skillInfo.currentXpMax - skillInfo.currentXp); @@ -613,7 +622,7 @@ public class FarmingSkillOverlay extends TextOverlay { if (skillInfo != null && skillInfo.level == 60) { int current = (int) skillInfo.currentXp; if (skillInfoLast != null && skillInfo.currentXpMax == skillInfoLast.currentXpMax) { - current = (int) interpolate(current, skillInfoLast.currentXp); + current = (int) interpolate(current, (float) skillInfoLast.currentXp); } if (foraging == 0) { |