diff --git a/gradle.properties b/gradle.properties index bd8f57f..7f065ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.11.0+kotlin.2.0.0 # Mod Properties -mod_version=0.2.12 +mod_version=0.2.13 maven_group=chickenmanfy.scify archives_base_name=scify diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt index 2576c01..adf8eff 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt @@ -70,10 +70,6 @@ class Bars { tessellator.draw() } buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE) - /*buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-180, MinecraftClient.getInstance().window.scaledHeight.toFloat() - 40, 0F).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() - buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-180, MinecraftClient.getInstance().window.scaledHeight.toFloat(), 0F).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() - buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-140, MinecraftClient.getInstance().window.scaledHeight.toFloat(), 0F).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() - buffer.vertex(positionMatrix, MinecraftClient.getInstance().window.scaledWidth.toFloat()/2-140, MinecraftClient.getInstance().window.scaledHeight.toFloat() - 40, 0F).color(1f, 1f, 1f, 1f).texture(1f, 0f).next()*/ buffer.vertex(positionMatrix, xHealth, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f).next() buffer.vertex(positionMatrix, xHealth, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f).next() buffer.vertex(positionMatrix, xHealth+width, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f).next() diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt index dee1fc5..d4a3256 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt @@ -50,6 +50,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) { .dimensions(width / 2 + 5, 84, 200, 20) .tooltip(Tooltip.of(Text.literal("Fishing Notifications (${if (fishingToggle) "Enabled" else "Disabled"})"))) .build() + fishingNotif?.active = false watermark = ButtonWidget.builder(Text.literal("Show Watermark")) { Watermark().toggleWaterMark() // Call the function toggleWaterMark() from the Watermark.kt module MinecraftClient.getInstance().setScreen(Menu()) @@ -64,6 +65,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) { .dimensions(width / 2 - 205, 124, 200, 20) .tooltip(Tooltip.of(Text.literal("Automatically sends \"wb\" when a player joins. (${if (autoWelcomeToggle) "Enabled" else "Disabled"})"))) .build() + autoWelcome?.active = false livelyMode = ButtonWidget.builder(Text.literal("City NPCs (Lively Mode)")) { LivelyMode().toggleLivelyMode() // Call the function toggleLivelyMode() from the LivelyMode.kt module MinecraftClient.getInstance().setScreen(Menu()) diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt index 8ade9c2..e201205 100644 --- a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt +++ b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt @@ -19,7 +19,7 @@ class Watermark { modDisableOverride) { if (watermarkToggle) { val minecraftClient = MinecraftClient.getInstance() - val scifyVersion = "0.2.12" + val scifyVersion = "0.2.13" drawContext?.drawTextWithShadow(minecraftClient.textRenderer,"§nSciFy v${scifyVersion}",minecraftClient.window.scaledWidth - minecraftClient.textRenderer.getWidth("SciFy v${scifyVersion}") - 5, minecraftClient.window.scaledHeight - minecraftClient.textRenderer.fontHeight - 5, 0xff00ff) } }