Skip to content

Commit

Permalink
Make health text gold when player has absorption, fix command error s…
Browse files Browse the repository at this point in the history
…trings, and update version numbers
  • Loading branch information
ILikePlayingGames committed Aug 19, 2022
1 parent 2e63017 commit 2d86f37
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx2G

# SkyblockAddons Properties
version=1.7.0-beta.3
version=1.7.0
# Set by CI
buildNumber=0
acceptedMinecraftVersions=[1.8.9]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import codes.biscuit.skyblockaddons.SkyblockAddons;
import codes.biscuit.skyblockaddons.core.Feature;
import codes.biscuit.skyblockaddons.core.Message;
import codes.biscuit.skyblockaddons.core.Translations;
import codes.biscuit.skyblockaddons.features.slayertracker.SlayerBoss;
import codes.biscuit.skyblockaddons.features.slayertracker.SlayerDrop;
Expand Down Expand Up @@ -365,11 +364,11 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
}
} else {
throw new WrongUsageException(Translations.getMessage(
"commands.responses.sba.errors.wrongUsage.subCommandNotFound", args[0]));
"commandUsage.sba.errors.wrongUsage.subCommandNotFound", args[0]));
}
} else {
throw new WrongUsageException(Translations.getMessage(
"commands.responses.sba.errors.wrongUsage.subCommandNotFound", args[0]));
"commandUsage.sba.errors.wrongUsage.subCommandNotFound", args[0]));
}
} else {
// If there's no arguments given, open the main GUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,9 @@ public void drawText(Feature feature, float scale, Minecraft mc, ButtonLocation
return;
}
} else if (feature == Feature.HEALTH_TEXT) {
if (mc.thePlayer.isPotionActive(22/* Absorption */)) {
color = ColorUtils.getDummySkyblockColor(ColorCode.GOLD.getColor(), main.getConfigValues().getChromaFeatures().contains(feature)).getColor();
}
text = NUMBER_FORMAT.format(getAttribute(Attribute.HEALTH)) + "/" + NUMBER_FORMAT.format(getAttribute(Attribute.MAX_HEALTH));

} else if (feature == Feature.DEFENCE_TEXT) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"bannerImageURL": null,
"bannerLink": null,

"latestVersion": "1.6.1",
"latestVersion": "1.7.0",
"latestBeta": "1.7.0-beta.3",
"videoLink": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/tag/v1.6.1",
"directDownload": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/download/v1.6.1/SkyblockAddons-1.6.1-for-MC-1.8.9.jar",
"videoLink": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/tag/v1.7.0",
"directDownload": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/download/v1.7.0/SkyblockAddons-1.7.0-for-MC-1.8.9.jar",

"updateInfo": {
"latestRelease": "1.6.1",
"releaseDownload": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/download/v1.6.1/SkyblockAddons-1.6.1-for-MC-1.8.9.jar",
"releaseChangelog": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/tag/v1.6.1",
"latestRelease": "1.7.0",
"releaseDownload": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/download/v1.7.0/SkyblockAddons-1.7.0-for-MC-1.8.9.jar",
"releaseChangelog": "https://github.com/BiscuitDevelopment/SkyblockAddons/releases/tag/v1.7.0",
"releaseShowcase": "",
"latestBeta": "1.7.0-beta.3",
"betaDownload": "https://discord.gg/zWyr3f5GXz",
Expand Down

0 comments on commit 2d86f37

Please sign in to comment.