diff --git a/build.gradle b/build.gradle
index b486d4a..8709898 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,12 +49,12 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 tasks.withType(KotlinCompile).configureEach {
 	kotlinOptions {
-		jvmTarget = 17
+		jvmTarget = 21
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index bd8f57f..cabcbf9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,8 +8,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
 loader_version=0.15.11
 fabric_kotlin_version=1.11.0+kotlin.2.0.0
 
@@ -19,4 +19,4 @@ maven_group=chickenmanfy.scify
 archives_base_name=scify
 
 # Dependencies
-fabric_version=0.97.1+1.20.4
\ No newline at end of file
+fabric_version=0.102.1+1.21.1
\ No newline at end of file
diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt
index 2576c01..cc9d69e 100644
--- a/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt
+++ b/src/client/kotlin/chickenmanfy/scify/modules/Bars.kt
@@ -47,46 +47,44 @@ class Bars {
         val yHealth = 5f
         val xReality = 5f
         val yReality = 10f + height
-        HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float ->
+        HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
             val tessellator: Tessellator = Tessellator.getInstance()
-            val buffer: BufferBuilder = tessellator.buffer
-            val positionMatrix = drawContext?.matrices?.peek()?.positionMatrix
+            val buffer: BufferBuilder = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR)
+            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" ||
                 modDisableOverride) {
                 if (barsToggle) {
                     if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599") {
-                        buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE)
-                        buffer.vertex(positionMatrix, xReality, yReality, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f).next()
-                        buffer.vertex(positionMatrix, xReality, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f).next()
-                        buffer.vertex(positionMatrix, xReality + width, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f).next()
-                        buffer.vertex(positionMatrix, xReality + width, yReality, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f).next()
-
-                        RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() }
-                        RenderSystem.setShaderTexture(0, Identifier("scify", "healthmana/mana/mana_${mana}.png"))
+                        buffer.vertex(positionMatrix, xReality, yReality, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f)
+                        buffer.vertex(positionMatrix, xReality, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f)
+                        buffer.vertex(positionMatrix, xReality + width, yReality + height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f)
+                        buffer.vertex(positionMatrix, xReality + width, yReality, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f)
+                        RenderSystem.setShader { GameRenderer.getPositionTexColorProgram() }
+                        RenderSystem.setShaderTexture(0, Identifier.of("scify", "healthmana/mana/mana_${mana}.png"))
                         RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
 
-                        tessellator.draw()
+                        BufferRenderer.drawWithGlobalProgram(buffer.end())
                     }
-                    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()
-                    buffer.vertex(positionMatrix, xHealth+width, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f).next()
+                    buffer.vertex(positionMatrix, xHealth, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(0f, 0f)
+                    buffer.vertex(positionMatrix, xHealth, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(0f, 1f)
+                    buffer.vertex(positionMatrix, xHealth+width, yHealth+height, 0f).color(1f, 1f, 1f, 1f).texture(1f, 1f)
+                    buffer.vertex(positionMatrix, xHealth+width, yHealth, 0f).color(1f, 1f, 1f, 1f).texture(1f, 0f)
                     val maxHealthDivided = MinecraftClient.getInstance().player?.maxHealth?.div(20)?.toInt()
                     val health = if (MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!)!! <= 20) MinecraftClient.getInstance().player?.health?.toInt()?.div(maxHealthDivided!!) else 20
-                    RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() }
-                    RenderSystem.setShaderTexture(0, Identifier("scify", "healthmana/health/health_${health}.png"))
+                    RenderSystem.setShader { GameRenderer.getPositionTexColorProgram() }
+                    RenderSystem.setShaderTexture(0, Identifier.of("scify", "healthmana/health/health_${health}.png"))
                     RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
 
-                    tessellator.draw()
+                    BufferRenderer.drawWithGlobalProgram(buffer.end())
                 }
             }
         })
+
+        /*HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
+            val color = -0x10000 // Red
+            drawContext.fill(0, 0, 100, 100, 0, color)
+        })*/
     }
 }
\ No newline at end of file
diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt
index dee1fc5..64cfdcf 100644
--- a/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt
+++ b/src/client/kotlin/chickenmanfy/scify/modules/Menu.kt
@@ -31,7 +31,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) {
             0xff00ff
         )
 
-        val texture = Identifier("scify", "scify.png")
+        val texture = Identifier.of("scify", "scify.png")
         context.drawTexture(texture, width / 2 - 32, 20, 0F, 0F, 64, 64, 64, 64)
     }
     public override fun init() {
diff --git a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt
index 8ade9c2..e193a03 100644
--- a/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt
+++ b/src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt
@@ -3,6 +3,7 @@ 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.RenderTickCounter
 
 var watermarkToggle = true
 class Watermark {
@@ -11,7 +12,7 @@ class Watermark {
     }
 
     fun watermark() {
-            HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float ->
+            HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
 
                 if (MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "dungeonfy.minehut.gg" ||
                     MinecraftClient.getInstance().networkHandler?.serverInfo?.address == "51.222.121.148:25599" ||
@@ -20,7 +21,7 @@ class Watermark {
                     if (watermarkToggle) {
                         val minecraftClient = MinecraftClient.getInstance()
                         val scifyVersion = "0.2.12"
-                        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)
+                        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)
                     }
                 }
             })
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 86155bf..73669e7 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -45,10 +45,10 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.6",
-		"minecraft": "~1.20.4",
+		"minecraft": "~1.21.1",
 		"java": ">=17",
 		"fabric-api": "*",
-		"fabric-language-kotlin": ">=1.9.22"
+		"fabric-language-kotlin": ">=1.11.0"
 	},
 	"suggests": {
 		"Mythicfy": "*"