aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRime <81419447+Emirlol@users.noreply.github.com>2024-06-21 12:03:05 +0300
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-07-22 14:25:11 +0800
commit1a550c6a77581a247571da6ce0c5f232525e79e8 (patch)
tree5c1f7c33e55a7fc9ad3bcf03e1971a3c6134980c
parent3de616fcaca8e39a4d1caef6fdd4f984adb7e000 (diff)
downloadSkyblocker-1a550c6a77581a247571da6ce0c5f232525e79e8.tar.gz
Skyblocker-1a550c6a77581a247571da6ce0c5f232525e79e8.tar.bz2
Skyblocker-1a550c6a77581a247571da6ce0c5f232525e79e8.zip
Un-debug some stuff in Utils for convenience
-rw-r--r--src/main/java/de/hysky/skyblocker/utils/Utils.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 042095d1..4de32710 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.utils;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mojang.util.UndashedUuid;
+import de.hysky.skyblocker.debug.Debug;
import de.hysky.skyblocker.events.SkyblockEvents;
import de.hysky.skyblocker.mixins.accessors.MessageHandlerAccessor;
import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
@@ -17,7 +18,6 @@ import net.azureaaron.hmapi.network.packet.s2c.HelloS2CPacket;
import net.azureaaron.hmapi.network.packet.s2c.HypixelS2CPacket;
import net.azureaaron.hmapi.network.packet.v1.s2c.LocationUpdateS2CPacket;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
-import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.network.PlayerListEntry;
@@ -239,9 +239,8 @@ public class Utils {
public static void updatePlayerPresenceFromScoreboard(MinecraftClient client) {
List<String> sidebar = STRING_SCOREBOARD;
- FabricLoader fabricLoader = FabricLoader.getInstance();
if (client.world == null || client.isInSingleplayer() || sidebar.isEmpty()) {
- if (fabricLoader.isDevelopmentEnvironment()) {
+ if (Debug.debugEnabled()) {
sidebar = Collections.emptyList();
} else {
isOnSkyblock = false;
@@ -249,13 +248,13 @@ public class Utils {
}
}
- if (sidebar.isEmpty() && !fabricLoader.isDevelopmentEnvironment()) return;
+ if (sidebar.isEmpty() && !Debug.debugEnabled()) return;
- if (fabricLoader.isDevelopmentEnvironment() || isConnectedToHypixel(client)) {
+ if (Debug.debugEnabled() || isConnectedToHypixel(client)) {
if (!isOnHypixel) {
isOnHypixel = true;
}
- if (fabricLoader.isDevelopmentEnvironment() || sidebar.getFirst().contains("SKYBLOCK") || sidebar.getFirst().contains("SKIBLOCK")) {
+ if (Debug.debugEnabled() || sidebar.getFirst().contains("SKYBLOCK") || sidebar.getFirst().contains("SKIBLOCK")) {
if (!isOnSkyblock) {
if (!isInjected) {
isInjected = true;