Skip to content

Commit 31a803d

Browse files
Merge pull request #19 from ninjaguardian/fix-rift-timer-spam
2 parents 40b3848 + c9f8a33 commit 31a803d

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/main/java/wtf/cheeze/sbt/utils/actionbar/ActionBarTransformer.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
2525
import net.minecraft.text.Text;
2626
import org.intellij.lang.annotations.Language;
27-
import wtf.cheeze.sbt.SkyblockTweaks;
2827
import wtf.cheeze.sbt.config.ConfigImpl;
2928
import wtf.cheeze.sbt.config.SBTConfig;
3029
import wtf.cheeze.sbt.events.ChatEvents;
@@ -197,7 +196,6 @@ public static ActionBarData extractData(String actionBarText) {
197196
data.maxDrillFuel = NumberUtils.parseIntWithKorM(drillFuel[1]);
198197
} else if (unformatted.contains("ф Left")) {
199198
// Rift Timer
200-
SkyblockTweaks.LOGGER.info("Rift Timer: {}", unformatted);
201199
Matcher matcher = riftTimePattern.matcher(unformatted);
202200
if (matcher.matches()) {
203201
data.riftTime = matcher.group("time");
@@ -282,7 +280,7 @@ public static Text runTransformations(Text actionBarText) {
282280
tickers = segment.split("Mana")[1];
283281
}
284282
newText.append(SEPERATOR5).append(tickers);
285-
} else if (!hideMana && hideTickers && hasTickers) {
283+
} else if (!hideMana) { // hideTickers and hasTickers are always true here (because of the if-statement above)
286284
// TM-HT
287285
String spliter = "";
288286
if (trimmed.contains(Symbols.OVERFLOW_MANA)) {
@@ -357,10 +355,7 @@ public static Text runTransformations(Text actionBarText) {
357355
}
358356

359357
public static void registerEvents() {
360-
ChatEvents.ON_ACTION_BAR.register(message -> {
361-
// SkyblockTweaks.LOGGER.info(message.getString());
362-
SkyblockData.update(ActionBarTransformer.extractData(message.getString()));
363-
});
358+
ChatEvents.ON_ACTION_BAR.register(message -> SkyblockData.update(ActionBarTransformer.extractData(message.getString())));
364359
ClientReceiveMessageEvents.MODIFY_GAME.register((message, overlay) -> {
365360
if (!overlay) return message;
366361
return ActionBarTransformer.runTransformations(message);
@@ -542,5 +537,3 @@ public static OptionGroup getGroup(ConfigImpl defaults, ConfigImpl config) {
542537

543538

544539
}
545-
546-

0 commit comments

Comments
 (0)