From 471edd79b145a80e67877059f024d4b3d8753eac Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Wed, 6 Sep 2023 00:42:01 -0400 Subject: 1.20.2-pre1 --- src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/utils/SlayerUtils.java | 3 ++- src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 11 ++++++----- .../utils/render/title/TitleContainerConfigScreen.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') 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..6dd55d00 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; @@ -166,10 +167,10 @@ 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() : ""; - - return serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io") || serverBrand.contains("Hypixel BungeeCord"); + String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : ""; + 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"); } private static void leaveSkyblock() { @@ -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 lines = new ArrayList<>(); for (ScoreboardPlayerScore score : scoreboard.getAllPlayerScores(objective)) { Team team = scoreboard.getPlayerTeam(score.getPlayerName()); 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; -- cgit From a72371d944c2fb5f311339bf20cd74f8d7bed967 Mon Sep 17 00:00:00 2001 From: Yasin Date: Fri, 22 Sep 2023 23:06:11 +0200 Subject: change curseforge link to modrinth --- gradle.properties | 6 +++--- src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils') diff --git a/gradle.properties b/gradle.properties index 1c8e60d4..b22cf9d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,11 +11,11 @@ loader_version=0.14.22 ## 1.20 fabric_api_version=0.89.1+1.20.2 -## Cloth Api (https://www.curseforge.com/minecraft/mc-mods/cloth-config/files) +## Cloth Api (https://modrinth.com/mod/cloth-config/versions) clothconfig_version=12.0.108 -## Mod Menu (https://www.curseforge.com/minecraft/mc-mods/modmenu/files) +## Mod Menu (https://modrinth.com/mod/modmenu/versions) mod_menu_version=8.0.0-beta.2 -## REI (https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items/files) +## REI (https://modrinth.com/mod/rei/versions?l=fabric) rei_version=12.0.625 ## EMI (https://modrinth.com/mod/emi/versions) emi_version = 1.0.19+1.20.1 diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 6dd55d00..b0fb6edf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -167,10 +167,10 @@ 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.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"); + String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : ""; + 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"); } private static void leaveSkyblock() { @@ -324,10 +324,10 @@ public class Utils { if (locRaw.has("map")) { map = locRaw.get("map").getAsString(); } - + boolean shouldFilter = !sentLocRaw; sentLocRaw = false; - + return shouldFilter; } } -- cgit