Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Random fixes #1006

Merged
merged 8 commits into from
Sep 26, 2024
Merged

Random fixes #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a503b7d
Refactor format time
kevinthegreat1 Sep 22, 2024
45610ff
Update pet tier parsing
kevinthegreat1 Sep 22, 2024
ed40e07
Update quick nav empty command message
kevinthegreat1 Sep 22, 2024
4bb2e49
Update pet id test
kevinthegreat1 Sep 22, 2024
0ef339b
Update health and speed bar
kevinthegreat1 Sep 22, 2024
f8665b9
Refactor bars updating
kevinthegreat1 Sep 22, 2024
f075ae0
Update regex
kevinthegreat1 Sep 22, 2024
c129224
Fix BazaarPriceTooltip sack crash
kevinthegreat1 Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/de/hysky/skyblocker/skyblock/PetCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.mojang.serialization.codecs.RecordCodecBuilder;
import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.annotations.Init;
import de.hysky.skyblocker.skyblock.item.SkyblockItemRarity;
import de.hysky.skyblocker.utils.ItemUtils;
import de.hysky.skyblocker.utils.Utils;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
Expand Down Expand Up @@ -137,9 +138,6 @@ public static PetInfo getCurrentPet() {
}

public record PetInfo(String type, double exp, String tier, Optional<String> uuid, Optional<String> item, Optional<String> skin) {
// TODO: Combine with SkyblockItemRarity
private static final String[] TIER_INDEX = {"COMMON", "UNCOMMON", "RARE", "EPIC", "LEGENDARY", "MYTHIC"};

public static final Codec<PetInfo> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.fieldOf("type").forGetter(PetInfo::type),
Codec.DOUBLE.fieldOf("exp").forGetter(PetInfo::exp),
Expand All @@ -153,7 +151,7 @@ public record PetInfo(String type, double exp, String tier, Optional<String> uui
).xmap(Object2ObjectOpenHashMap::new, Object2ObjectOpenHashMap::new);

public int tierIndex() {
return ArrayUtils.indexOf(TIER_INDEX, tier);
return SkyblockItemRarity.valueOf(tier).ordinal();
}
}
}
280 changes: 140 additions & 140 deletions src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,154 +2,154 @@

import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.utils.Location;
import de.hysky.skyblocker.utils.RegexUtils;
import de.hysky.skyblocker.utils.Utils;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.text.Text;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class StatusBarTracker {
private static final Pattern STATUS_HEALTH = Pattern.compile("§[6c](\\d+(,\\d\\d\\d)*)/(\\d+(,\\d\\d\\d)*)❤(?:(\\+§c(\\d+(,\\d\\d\\d)*). *)| *)");
private static final Pattern DEFENSE_STATUS = Pattern.compile("§a(\\d+(,\\d\\d\\d)*)§a❈ Defense *");
private static final Pattern MANA_USE = Pattern.compile("§b-(\\d+(,\\d\\d\\d)*) Mana \\(§\\S+(?:\\s\\S+)* *");
private static final Pattern MANA_STATUS = Pattern.compile("§b(\\d+(,\\d\\d\\d)*)/(\\d+(,\\d\\d\\d)*)✎ (?:Mana|§3(\\d+(,\\d\\d\\d)*)ʬ) *");

private Resource health = new Resource(100, 100, 0);
private Resource mana = new Resource(100, 100, 0);
private Resource speed = new Resource(100, 400, 0);
private int defense = 0;

public void init() {
ClientReceiveMessageEvents.ALLOW_GAME.register(this::allowOverlayMessage);
ClientReceiveMessageEvents.MODIFY_GAME.register(this::onOverlayMessage);
}

public Resource getHealth() {
return this.health;
}

public Resource getMana() {
return this.mana;
}

public int getDefense() {
return this.defense;
}

public Resource getSpeed() {
updateSpeed();
return this.speed;
}

private int parseInt(Matcher m, int group) {
return Integer.parseInt(m.group(group).replace(",", ""));
}

private void updateMana(Matcher m) {
int value = parseInt(m, 1);
int max = parseInt(m, 3);
int overflow = m.group(5) == null ? 0 : parseInt(m, 5);
this.mana = new Resource(value, max, overflow);
}

private void updateSpeed() {
// Black cat and racing helm are untested - I don't have the money to test atm, but no reason why they shouldn't work
var player = MinecraftClient.getInstance().player;
int value = (int) (player.isSprinting() ? (player.getMovementSpeed() / 1.3f) * 1000 : player.getMovementSpeed() * 1000);
int max = 400; // hardcoded limit (except for with cactus knife, black cat, snail, racing helm, young drag)
if (player.getMainHandStack().getName().getString().contains("Cactus Knife") && Utils.getLocation() == Location.GARDEN) {
max = 500;
}
Iterable<ItemStack> armor = player.getArmorItems();
int youngDragCount = 0;
for (ItemStack armorPiece : armor) {
if (armorPiece.getName().getString().contains("Racing Helmet")) {
max = 500;
} else if (armorPiece.getName().getString().contains("Young Dragon")) {
youngDragCount++;
}
}
if (youngDragCount == 4) {
max = 500;
}

PetCache.PetInfo pet = PetCache.getCurrentPet();
if (pet != null) {
if (pet.type().contains("BLACK_CAT")) {
max = 500;
} else if (pet.type().contains("SNAIL")) {
max = 100;
}
}
this.speed = new Resource(value, max, 0);
}

private void updateHealth(Matcher m) {
int value = parseInt(m, 1);
int max = parseInt(m, 3);
int overflow = Math.max(0, value - max);
if (MinecraftClient.getInstance() != null && MinecraftClient.getInstance().player != null) {
ClientPlayerEntity player = MinecraftClient.getInstance().player;
value = (int) (player.getHealth() * max / player.getMaxHealth());
overflow = (int) (player.getAbsorptionAmount() * max / player.getMaxHealth());
}
this.health = new Resource(Math.min(value, max), max, Math.min(overflow, max));
}

private String reset(String str, Matcher m) {
str = str.substring(m.end());
m.reset(str);
return str;
}

private boolean allowOverlayMessage(Text text, boolean overlay) {
onOverlayMessage(text, overlay);
return true;
}

private Text onOverlayMessage(Text text, boolean overlay) {
if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || Utils.isInTheRift()) {
return text;
}
return Text.of(update(text.getString(), SkyblockerConfigManager.get().chat.hideMana));
}

public String update(String actionBar, boolean filterManaUse) {
var sb = new StringBuilder();
Matcher matcher = STATUS_HEALTH.matcher(actionBar);
if (!matcher.lookingAt())
return actionBar;
updateHealth(matcher);
if (matcher.group(5) != null) {
sb.append("§c❤");
sb.append(matcher.group(5));
}
actionBar = reset(actionBar, matcher);
if (matcher.usePattern(MANA_STATUS).lookingAt()) {
defense = 0;
updateMana(matcher);
actionBar = reset(actionBar, matcher);
} else {
if (matcher.usePattern(DEFENSE_STATUS).lookingAt()) {
defense = parseInt(matcher, 1);
actionBar = reset(actionBar, matcher);
} else if (filterManaUse && matcher.usePattern(MANA_USE).lookingAt()) {
actionBar = reset(actionBar, matcher);
}
if (matcher.usePattern(MANA_STATUS).find()) {
updateMana(matcher);
matcher.appendReplacement(sb, "");
}
}
matcher.appendTail(sb);
String res = sb.toString().trim();
return res.isEmpty() ? null : res;
}

public record Resource(int value, int max, int overflow) {
}
private static final Pattern STATUS_HEALTH = Pattern.compile("§[6c](?<health>[\\d,]+)/(?<max>[\\d,]+)❤ *(?<healing>\\+§c([\\d,]+). *)?");
private static final Pattern DEFENSE_STATUS = Pattern.compile("§a(?<defense>[\\d,]+)§a❈ Defense *");
private static final Pattern MANA_USE = Pattern.compile("§b-([\\d,]+) Mana \\(§.*?\\) *");
private static final Pattern MANA_STATUS = Pattern.compile("§b(?<mana>[\\d,]+)/(?<max>[\\d,]+)✎ (?:Mana|§3(?<overflow>[\\d,]+)ʬ) *");

private final MinecraftClient client = MinecraftClient.getInstance();
private Resource health = new Resource(100, 100, 0);
private Resource mana = new Resource(100, 100, 0);
private Resource speed = new Resource(100, 400, 0);
private int defense = 0;

public void init() {
ClientReceiveMessageEvents.ALLOW_GAME.register(this::allowOverlayMessage);
ClientReceiveMessageEvents.MODIFY_GAME.register(this::onOverlayMessage);
Scheduler.INSTANCE.scheduleCyclic(this::tick, 1);
}

public Resource getHealth() {
return this.health;
}

public Resource getMana() {
return this.mana;
}

public int getDefense() {
return this.defense;
}

public Resource getSpeed() {
return this.speed;
}

private void tick() {
if (client == null || client.player == null) return;
updateHealth(health.value, health.max, health.overflow);
updateSpeed();
}

private boolean allowOverlayMessage(Text text, boolean overlay) {
onOverlayMessage(text, overlay);
return true;
}

private Text onOverlayMessage(Text text, boolean overlay) {
if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().uiAndVisuals.bars.enableBars || Utils.isInTheRift()) {
return text;
}
return Text.of(update(text.getString(), SkyblockerConfigManager.get().chat.hideMana));
}

public String update(String actionBar, boolean filterManaUse) {
var sb = new StringBuilder();

// Match health and don't add it to the string builder
// Append healing to the string builder if there is any healing
Matcher matcher = STATUS_HEALTH.matcher(actionBar);
if (!matcher.find()) return actionBar;
updateHealth(matcher);
if (matcher.group("healing") != null) {
sb.append("§c❤");
}
matcher.appendReplacement(sb, "$3");

// Match defense or mana use and don't add it to the string builder
if (matcher.usePattern(DEFENSE_STATUS).find()) {
defense = RegexUtils.parseIntFromMatcher(matcher, "defense");
matcher.appendReplacement(sb, "");
} else if (filterManaUse && matcher.usePattern(MANA_USE).find()) {
matcher.appendReplacement(sb, "");
}

// Match mana and don't add it to the string builder
if (matcher.usePattern(MANA_STATUS).find()) {
updateMana(matcher);
matcher.appendReplacement(sb, "");
}

// Append the rest of the message to the string builder
matcher.appendTail(sb);
String res = sb.toString().trim();
return res.isEmpty() ? null : res;
}

private void updateHealth(Matcher matcher) {
int health = RegexUtils.parseIntFromMatcher(matcher, "health");
int max = RegexUtils.parseIntFromMatcher(matcher, "max");
updateHealth(health, max, Math.max(0, health - max));
}

private void updateHealth(int value, int max, int overflow) {
if (client != null && client.player != null) {
value = (int) (client.player.getHealth() * max / client.player.getMaxHealth());
overflow = (int) (client.player.getAbsorptionAmount() * max / client.player.getMaxHealth());
}
health = new Resource(Math.min(value, max), max, Math.min(overflow, max));
}

private void updateMana(Matcher m) {
int mana = RegexUtils.parseIntFromMatcher(m, "mana");
int max = RegexUtils.parseIntFromMatcher(m, "max");
int overflow = m.group("overflow") == null ? 0 : RegexUtils.parseIntFromMatcher(m, "overflow");
this.mana = new Resource(mana, max, overflow);
}

private void updateSpeed() {
// Black cat and racing helm are untested - I don't have the money to test atm, but no reason why they shouldn't work
assert client.player != null;
int value = (int) (client.player.isSprinting() ? (client.player.getMovementSpeed() / 1.3f) * 1000 : client.player.getMovementSpeed() * 1000);
int max = 400; // hardcoded limit (except for with cactus knife, black cat, snail, racing helm, young drag)
if (client.player.getMainHandStack().getName().getString().contains("Cactus Knife") && Utils.getLocation() == Location.GARDEN) {
max = 500;
}
Iterable<ItemStack> armor = client.player.getArmorItems();
int youngDragCount = 0;
for (ItemStack armorPiece : armor) {
if (armorPiece.getName().getString().contains("Racing Helmet")) {
max = 500;
} else if (armorPiece.getName().getString().contains("Young Dragon")) {
youngDragCount++;
}
}
if (youngDragCount == 4) {
max = 500;
}

PetCache.PetInfo pet = PetCache.getCurrentPet();
if (pet != null) {
if (pet.type().contains("BLACK_CAT")) {
max = 500;
} else if (pet.type().contains("SNAIL")) {
max = 100;
}
}
this.speed = new Resource(value, max, 0);
}

public record Resource(int value, int max, int overflow) {}
}
Loading