diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils')
4 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java index 17874c9c..977d013c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java @@ -17,7 +17,7 @@ public class Boxes { /** Returns the vector of the side lengths of this box. **/ public static Vec3d getLengthVec(Box box) { - return new Vec3d(box.getXLength(), box.getYLength(), box.getZLength()); + return new Vec3d(box.getLengthX(), box.getLengthY(), box.getLengthZ()); } /** Offsets this box so that minX, minY and minZ are all zero. **/ diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/SlayerUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/SlayerUtils.java index 6bc09456..216dc7e9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/SlayerUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/SlayerUtils.java @@ -5,6 +5,7 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.decoration.ArmorStandEntity; import net.minecraft.scoreboard.Scoreboard; +import net.minecraft.scoreboard.ScoreboardDisplaySlot; import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.scoreboard.ScoreboardPlayerScore; import net.minecraft.scoreboard.Team; @@ -48,7 +49,7 @@ public class SlayerUtils { ClientPlayerEntity client = MinecraftClient.getInstance().player; if (client == null) return false; Scoreboard scoreboard = MinecraftClient.getInstance().player.getScoreboard(); - ScoreboardObjective objective = scoreboard.getObjectiveForSlot(1); + ScoreboardObjective objective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.FROM_ID.apply(1)); for (ScoreboardPlayerScore score : scoreboard.getAllPlayerScores(objective)) { Team team = scoreboard.getPlayerTeam(score.getPlayerName()); if (team != null) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 755e191d..b0fb6edf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -15,6 +15,7 @@ import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.scoreboard.Scoreboard; +import net.minecraft.scoreboard.ScoreboardDisplaySlot; import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.scoreboard.ScoreboardPlayerScore; import net.minecraft.scoreboard.Team; @@ -167,7 +168,7 @@ public class Utils { private static boolean isConnectedToHypixel(MinecraftClient client) { String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : ""; - String serverBrand = (client.player != null && client.player.getServerBrand() != null) ? client.player.getServerBrand() : ""; + String serverBrand = (client.player != null && client.player.networkHandler != null && client.player.networkHandler.getBrand() != null) ? client.player.networkHandler.getBrand() : ""; return serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io") || serverBrand.contains("Hypixel BungeeCord"); } @@ -244,7 +245,7 @@ public class Utils { ClientPlayerEntity client = MinecraftClient.getInstance().player; if (client == null) return Collections.emptyList(); Scoreboard scoreboard = MinecraftClient.getInstance().player.getScoreboard(); - ScoreboardObjective objective = scoreboard.getObjectiveForSlot(1); + ScoreboardObjective objective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.FROM_ID.apply(1)); List<String> lines = new ArrayList<>(); for (ScoreboardPlayerScore score : scoreboard.getAllPlayerScores(objective)) { Team team = scoreboard.getPlayerTeam(score.getPlayerName()); @@ -323,10 +324,10 @@ public class Utils { if (locRaw.has("map")) { map = locRaw.get("map").getAsString(); } - + boolean shouldFilter = !sentLocRaw; sentLocRaw = false; - + return shouldFilter; } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java index 8d31e2ea..29f87961 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java @@ -28,7 +28,7 @@ public class TitleContainerConfigScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); TitleContainer.render(context, Set.of(example1, example2, example3), (int) hudX, (int) hudY, delta); SkyblockerConfig.Direction direction = SkyblockerConfig.get().general.titleContainer.direction; SkyblockerConfig.Alignment alignment = SkyblockerConfig.get().general.titleContainer.alignment; |