diff --git a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt index 505875d..bece40c 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt @@ -13,10 +13,9 @@ class AutoWelcome { fun autoWelcome() { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (autoWelcomeToggle) { - return // TODO: Combine init{} with this function. + return } } } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt index f6c19e0..31f7f83 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt @@ -53,8 +53,7 @@ class Bars { val positionMatrix = drawContext?.matrices?.peek()?.positionMatrix if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (barsToggle) { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599") { buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) diff --git a/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt b/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt index 26e08e6..74dc3d8 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt @@ -16,8 +16,7 @@ class FishingNotif { fun fishingNotif() { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (fishingToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt b/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt index 47c0cb6..f46f123 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt @@ -60,8 +60,7 @@ class Hotkey { while (warp.wasPressed()) { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("warp") } @@ -70,8 +69,7 @@ class Hotkey { while (enderchest.wasPressed()) { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("ec") println(ClientReceiveMessageEvents.CHAT) @@ -80,8 +78,7 @@ class Hotkey { while (guide.wasPressed()) { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("guide") } @@ -89,8 +86,7 @@ class Hotkey { while (menu.wasPressed()) { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().setScreen(Menu()) } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt b/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt index 0b2b5c1..2b25124 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt @@ -11,8 +11,7 @@ class LivelyMode { fun livelyMode() { if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (livelyModeToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt index a740c45..c302c17 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt @@ -11,12 +11,11 @@ class Watermark { } fun watermark() { - HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, tickDelta: Float -> + HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float -> if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" || MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com" || - MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "proxyfy.minehut.gg") { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (watermarkToggle) { val minecraftClient = MinecraftClient.getInstance() val scifyVersion = "0.2.0"