aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErymanthus <erymanthus@erymant6inchmbp.lan>2022-06-13 14:20:26 -0400
committerErymanthus <erymanthus@erymant6inchmbp.lan>2022-06-13 14:20:26 -0400
commit7e97500a6cb542fbbde0c5dbcdcb5487d6a29047 (patch)
treebcda63e894e382a79a9cac553b2d2d81f30baa50
parent9da4c6e8889d6238793aba52596ccc6560dedf32 (diff)
downloadSkyblockHud-Death-Defied-7e97500a6cb542fbbde0c5dbcdcb5487d6a29047.tar.gz
SkyblockHud-Death-Defied-7e97500a6cb542fbbde0c5dbcdcb5487d6a29047.tar.bz2
SkyblockHud-Death-Defied-7e97500a6cb542fbbde0c5dbcdcb5487d6a29047.zip
dominus groundwork
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java5
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java13
2 files changed, 15 insertions, 3 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java b/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
index 1c3cbb0..d30c7a7 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java
@@ -19,6 +19,7 @@ public class RPGHud extends Gui {
private static int mana, maxMana, overflow = 0;
private static int health, maxHealth = 0;
+ // private static int dominus, maxDominus = 0;
private static int defense = 0;
public static void updateMana(int current, int max) {
@@ -39,6 +40,10 @@ public class RPGHud extends Gui {
defense = input;
}
+ // public static void updateDominus(int input) {
+ // dominus = input;
+ // }
+
public static void manaPredictionUpdate(boolean isIncrease, int decrease) {
mana = isIncrease ? Math.min(mana + (maxMana / 50), maxMana) : mana - decrease;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
index b84ef2c..5690ce4 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java
@@ -17,19 +17,20 @@ public class ActionBarParsing {
private static String lastActionBar = "";
public static String lastLowActionBar = "";
- private static IChatComponent lastLowEditedActionBar = null;
+ private static IChatComponent lastLowEditedActionBar = null; //\u1750
private static final Pattern HealthRegex = Pattern.compile("([0-9]+)/([0-9]+)\u2764");
- private static final Pattern HealingRegex = Pattern.compile("\\+([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");
+ // private static final Pattern HealingRegex = Pattern.compile("\\+([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");
private static final Pattern DefenseRegex = Pattern.compile("([0-9]+)\u2748 Defense");
private static final Pattern ManaRegex = Pattern.compile("([0-9]+)/([0-9]+)\u270E Mana");
private static final Pattern ManaOverflowRegex = Pattern.compile("([0-9]+)/([0-9]+)\u270E ([0-9]+)\u02AC");
private static final Pattern ManaDecreaseRegex = Pattern.compile("-([0-9]+) Mana \\(");
private static final Pattern DrillFuelRegex = Pattern.compile("([0-9,]+)/([0-9,]+k) Drill Fuel");
private static final Pattern XpGainRegex = Pattern.compile("\\+(\\d*\\.?\\d*) (Farming|Mining|Combat|Foraging|Fishing|Enchanting|Alchemy|Carpentry|Runecrafting|Social) \\((\\d*\\.?\\d*)%\\)");
+ // private static final Pattern DominusRegex = Pattern.compile("([0-9]+)\u1750");
private static final Pattern HealthReplaceRegex = Pattern.compile("\u00A7c([0-9]+)/([0-9]+)\u2764");
- private static final Pattern HealingReplaceRegex = Pattern.compile("\\+\u00A7c([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");
+ // private static final Pattern HealingReplaceRegex = Pattern.compile("\\+\u00A7c([0-9]+)[\u2586\u2585\u2584\u2583\u2582\u2581]");
private static final Pattern HealthAbsorptionReplaceRegex = Pattern.compile("\u00A76([0-9]+)/([0-9]+)\u2764");
private static final Pattern DefenseReplaceRegex = Pattern.compile("\u00A7a([0-9]+)\u00A7a\u2748 Defense");
private static final Pattern ManaReplaceRegex = Pattern.compile("\u00A7b([0-9]+)/([0-9]+)\u270E Mana");
@@ -107,6 +108,7 @@ public class ActionBarParsing {
Matcher ManaUseMatcher = ManaDecreaseRegex.matcher(bar);
Matcher ManaOverflowMatcher = ManaOverflowRegex.matcher(bar);
Matcher XpGainMatcher = XpGainRegex.matcher(bar);
+ // Matcher DominusMatcher = DominusRegex.matcher(bar);
boolean healthFound = HealthMatcher.find();
boolean defenseFound = DefenseMatcher.find();
@@ -114,6 +116,7 @@ public class ActionBarParsing {
boolean manaUseFound = ManaUseMatcher.find();
boolean manaOverflowFound = ManaOverflowMatcher.find();
boolean xpFound = XpGainMatcher.find();
+ // boolean dominusFound = DominusMatcher.find();
if (healthFound) {
try {
@@ -132,6 +135,10 @@ public class ActionBarParsing {
RPGHud.updateMana(Integer.parseInt(ManaMatcher.group(1)), Integer.parseInt(ManaMatcher.group(2)));
} catch (Exception ignored) {}
}
+ // if (dominusFound) {
+ // try {
+ // } catch (Exception ignored) {}
+ // }
if (!manaFound && manaOverflowFound) {
try {
RPGHud.updateMana(Integer.parseInt(ManaOverflowMatcher.group(1)), Integer.parseInt(ManaOverflowMatcher.group(2)));