diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
4 files changed, 12 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt index 8b696ad61..bb3be6d0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt @@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.StringUtils.matchRegex -import net.minecraft.client.Minecraft import net.minecraft.entity.item.EntityArmorStand import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -25,7 +24,7 @@ class DungeonCopilot { changeNextStep("Ready up") } if (message.endsWith("§a is now ready!")) { - var name = Minecraft.getMinecraft().thePlayer.name + var name = LorenzUtils.getPlayerName() if (message.contains(name)) { changeNextStep("Wait for the dungeon to start!") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt index 25495a596..0bc7887e5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt @@ -342,6 +342,13 @@ class GardenVisitorFeatures { if (!name.contains("§")) { name = "§f$name" } + + // Hide hypixel watchdog entries + if (name.contains("§c") && !name.contains("Spaceman")) continue + + //hide own player name + if (name.contains(LorenzUtils.getPlayerUuid())) continue + visitorsInTab.add(name) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt index 8a3299561..549ff4511 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt @@ -29,7 +29,7 @@ class MarkedPlayerManager { val name = displayName.lowercase() - if (name == Minecraft.getMinecraft().thePlayer.name.lowercase()) { + if (name == LorenzUtils.getPlayerName().lowercase()) { LorenzUtils.chat("§c[SkyHanni] You can't add or remove yourself this way! Go to the settings and toggle 'Mark your own name'.") return } @@ -66,7 +66,7 @@ class MarkedPlayerManager { @SubscribeEvent fun onConfigLoad(event: ConfigLoadEvent) { SkyHanniMod.feature.markedPlayers.markOwnName.whenChanged { old, new -> - val name = Minecraft.getMinecraft().thePlayer.name + val name = LorenzUtils.getPlayerName() if (new) { if (!playerNamesToMark.contains(name)) { playerNamesToMark.add(name) @@ -116,7 +116,7 @@ class MarkedPlayerManager { markedPlayers.clear() if (SkyHanniMod.feature.markedPlayers.markOwnName.get()) { - val name = Minecraft.getMinecraft().thePlayer.name + val name = LorenzUtils.getPlayerName() if (!playerNamesToMark.contains(name)) { playerNamesToMark.add(name) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt index d80c45974..7b3a5a667 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -82,7 +82,7 @@ class SummoningMobManager { val name = it.displayName.unformattedText val matcher = healthPattern.matcher(name) if (matcher.matches()) { - val playerName = Minecraft.getMinecraft().thePlayer.name + val playerName = LorenzUtils.getPlayerName() if (name.contains(playerName)) { summoningMobNametags.add(it as EntityArmorStand) if (summoningMobNametags.size == summoningsSpawned) { |