diff --git a/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt b/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt index ed69546..c2f09bc 100644 --- a/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt +++ b/src/client/kotlin/chickenmanfy/scify/SciFyClient.kt @@ -5,7 +5,6 @@ import net.fabricmc.api.ClientModInitializer object SciFyClient : ClientModInitializer { - val debugUser = "Chickenmanfy" override fun onInitializeClient() { // Run the Modules @@ -13,6 +12,7 @@ object SciFyClient : ClientModInitializer { AutoWelcome().autoWelcome() FishingNotif().fishingNotif() Bars().bars() + Watermark().watermark() //LivelyMode().livelyMode() } } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt index d7726f7..35bebc9 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/AutoWelcome.kt @@ -1,6 +1,5 @@ package chickenmanfy.scify.modules -import chickenmanfy.scify.SciFyClient.debugUser import net.minecraft.client.MinecraftClient var autoWelcomeToggle: Boolean = false @@ -12,8 +11,7 @@ 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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (autoWelcomeToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt index dad620c..0f1bc40 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt @@ -1,7 +1,6 @@ package chickenmanfy.scify.modules import chickenmanfy.scify.BridgeMixins -import chickenmanfy.scify.SciFyClient.debugUser import com.mojang.blaze3d.systems.RenderSystem import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback import net.minecraft.client.MinecraftClient @@ -20,8 +19,7 @@ class Bars { val tessellator: Tessellator = Tessellator.getInstance() val buffer: BufferBuilder = tessellator.buffer val positionMatrix = drawContext?.matrices?.peek()?.positionMatrix - if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" || - MinecraftClient.getInstance().player?.name?.string == debugUser) { + if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599") { if (barsToggle) { buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) buffer.vertex(positionMatrix, 240F, 460F, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() diff --git a/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt b/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt index bff4643..74dc3d8 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/FishingNotif.kt @@ -1,6 +1,5 @@ package chickenmanfy.scify.modules -import chickenmanfy.scify.SciFyClient.debugUser import net.minecraft.client.MinecraftClient var fishingToggle: Boolean = false @@ -17,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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) { + 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 159ff47..ed2674e 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Hotkey.kt @@ -1,6 +1,5 @@ package chickenmanfy.scify.modules -import chickenmanfy.scify.SciFyClient.debugUser import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper import net.minecraft.client.MinecraftClient @@ -60,8 +59,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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) // Test override + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("warp") } @@ -70,8 +68,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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) // Test override + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("ec") } @@ -79,8 +76,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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) // Test override + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { MinecraftClient.getInstance().networkHandler!!.sendChatCommand("guide") } @@ -88,8 +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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) // Test override + 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 b79b2d7..2b25124 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/LivelyMode.kt @@ -1,6 +1,5 @@ package chickenmanfy.scify.modules -import chickenmanfy.scify.SciFyClient.debugUser import net.minecraft.client.MinecraftClient var livelyModeToggle: Boolean = false @@ -12,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" || // if you join minehut.com and type /join dungeonfy - MinecraftClient.getInstance().player?.name?.string == debugUser) { + MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "minehut.com") { if (livelyModeToggle) { return } diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt index b2b74fa..622a317 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt @@ -14,7 +14,7 @@ import net.minecraft.util.Identifier class Menu : Screen(Text.literal("SciFy Menu")) { private var dynamicBars: ButtonWidget? = null private var fishingNotif: ButtonWidget? = null - private var warpHotkeys: ButtonWidget? = null + private var watermark: ButtonWidget? = null private var autoWelcome: ButtonWidget? = null private var livelyMode: ButtonWidget? = null private var resourcePack: ButtonWidget? = null @@ -46,11 +46,11 @@ class Menu : Screen(Text.literal("SciFy Menu")) { .dimensions(width / 2 + 5, 84, 200, 20) .tooltip(Tooltip.of(Text.literal("Fishing Notifications"))) .build() - warpHotkeys = ButtonWidget.builder(Text.literal("Toggle hotkeys")) { - // I don't think we actually need this module at all. TODO: replace with something else + watermark = ButtonWidget.builder(Text.literal("Show Watermark")) { + Watermark().toggleWaterMark() // Call the function toggleWaterMark() from the Watermark.kt module } .dimensions(width / 2 - 205, 164, 200, 20) - .tooltip(Tooltip.of(Text.literal("Enable/Disable hotkeys."))) + .tooltip(Tooltip.of(Text.literal("Enable/Disable the small text in the bottom right displaying the mod name."))) .build() autoWelcome = ButtonWidget.builder(Text.literal("Auto-Welcome")) { AutoWelcome().toggleAutoWelcome() // Call the function toggleAutoWelcome() from the AutoWelcome.kt module @@ -73,7 +73,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) { addDrawableChild(dynamicBars) addDrawableChild(fishingNotif) - //addDrawableChild(warpHotkeys) + addDrawableChild(watermark) addDrawableChild(autoWelcome) //addDrawableChild(livelyMode) addDrawableChild(resourcePack) diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt new file mode 100644 index 0000000..2bbf880 --- /dev/null +++ b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt @@ -0,0 +1,27 @@ +package chickenmanfy.scify.modules + +import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback +import net.minecraft.client.MinecraftClient +import net.minecraft.client.gui.DrawContext +import net.minecraft.client.render.* + +var watermarkToggle = true +class Watermark() { + fun toggleWaterMark() { + watermarkToggle = !watermarkToggle + } + + fun watermark() { + HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, tickDelta: Float -> + val tessellator: Tessellator = Tessellator.getInstance() + + if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" + ) { + if (watermarkToggle) { + val minecraftClient = MinecraftClient.getInstance() + drawContext?.drawTextWithShadow(minecraftClient.textRenderer,"§nSciFy v0.1.0",minecraftClient.window.scaledWidth - minecraftClient.textRenderer.getWidth("SciFy v0.1.0") - 5, minecraftClient.window.scaledHeight - minecraftClient.textRenderer.fontHeight - 5, 0xff00ff) + } + } + }) + } +} \ No newline at end of file