diff --git a/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt b/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt index c2f09bc..c966dd7 100644 --- a/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt +++ b/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt @@ -13,6 +13,6 @@ object SciFyClient : ClientModInitializer { FishingNotif().fishingNotif() Bars().bars() Watermark().watermark() - //LivelyMode().livelyMode() + LivelyMode().livelyMode() } } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt index bece40c..d99a241 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt @@ -13,7 +13,8 @@ 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 == "minehut.com" || + modDisableOverride) { if (autoWelcomeToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt index 31f7f83..a641d2f 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt @@ -53,7 +53,8 @@ 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 == "minehut.com" || + modDisableOverride) { 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 74dc3d8..2659522 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt @@ -16,7 +16,8 @@ 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 == "minehut.com" || + modDisableOverride) { if (fishingToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt b/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt index f46f123..e6fe258 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt @@ -84,12 +84,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().setScreen(Menu()) - } + MinecraftClient.getInstance().setScreen(Menu()) } while (debug.wasPressed()) { println(MinecraftClient.getInstance().networkHandler?.serverInfo?.address) diff --git a/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt b/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt index 2b25124..f08fe76 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt @@ -11,7 +11,8 @@ 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 == "minehut.com" || + modDisableOverride) { if (livelyModeToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt index 7ddcce2..dee1fc5 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt @@ -10,7 +10,7 @@ import net.minecraft.client.gui.widget.ButtonWidget import net.minecraft.text.Text import net.minecraft.util.Identifier - +var modDisableOverride = false @Environment(EnvType.CLIENT) class Menu : Screen(Text.literal("SciFy Menu")) { private var dynamicBars: ButtonWidget? = null @@ -19,6 +19,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) { private var autoWelcome: ButtonWidget? = null private var livelyMode: ButtonWidget? = null private var resourcePack: ButtonWidget? = null + private var forceMod: ButtonWidget? = null override fun render(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) { super.render(context, mouseX, mouseY, delta) @@ -78,11 +79,20 @@ class Menu : Screen(Text.literal("SciFy Menu")) { .tooltip(Tooltip.of(Text.literal("Toggles the community resource pack. (${if (fishingToggle) "Enabled" else "Disabled"})"))) .build() + forceMod = ButtonWidget.builder(Text.literal("ADVANCED: Force enable mod features")) { + modDisableOverride = !modDisableOverride + println(modDisableOverride) + MinecraftClient.getInstance().setScreen(Menu()) + } + .dimensions(width / 2 - 100, height - 40, 200, 20) + .tooltip(Tooltip.of(Text.literal("Disables the requirement to be on Dungeonfy. This means the features work on every server. This is not recommended. (${if (modDisableOverride) "Enabled" else "Disabled"})"))) + .build() addDrawableChild(dynamicBars) addDrawableChild(fishingNotif) addDrawableChild(watermark) addDrawableChild(autoWelcome) //addDrawableChild(livelyMode) addDrawableChild(resourcePack) + addDrawableChild(forceMod) } } \ No newline at end of file diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt index c302c17..90f716e 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt @@ -15,7 +15,8 @@ class Watermark { 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 == "minehut.com" || + modDisableOverride) { if (watermarkToggle) { val minecraftClient = MinecraftClient.getInstance() val scifyVersion = "0.2.0"