update roadmap

README.md

@@ -17,4 +17,4 @@ _Currently in beta so expect bugs._
 - Fishing notifications (0%)
 - Macros (100%)
 - Miningfy Initial Support (0%)
-- Update to latest game version (0%)
+- Update to latest game version (0%)

build.gradle

@@ -49,12 +49,12 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 17
 }
 
 tasks.withType(KotlinCompile).configureEach {
 	kotlinOptions {
-		jvmTarget = 21
+		jvmTarget = 17
 	}
 }
 

gradle.properties

@@ -8,15 +8,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
 loader_version=0.15.11
 fabric_kotlin_version=1.11.0+kotlin.2.0.0
 
 # Mod Properties
-mod_version=0.2.13-1.21.1
+mod_version=0.2.13
 maven_group=chickenmanfy.scify
 archives_base_name=scify
 
 # Dependencies
-fabric_version=0.102.1+1.21.1
+fabric_version=0.97.1+1.20.4

src/client/kotlin/chickenmanfy/scify/modules/Bars.kt

@@ -47,37 +47,40 @@ class Bars {
         val yHealth = 5f
         val xReality = 5f
         val yReality = 10f + height
-        HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
+        HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext?, _: Float ->
             val tessellator: Tessellator = Tessellator.getInstance()
-            val buffer: BufferBuilder = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR)
-            val positionMatrix = drawContext.matrices?.peek()?.positionMatrix
+            val buffer: BufferBuilder = tessellator.buffer
+            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.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"))
+                        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"))
                         RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
 
-                        BufferRenderer.drawWithGlobalProgram(buffer.end())
+                        tessellator.draw()
                     }
-                    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)
+                    buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR_TEXTURE)
+                    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()
                     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.getPositionTexColorProgram() }
-                    RenderSystem.setShaderTexture(0, Identifier.of("scify", "healthmana/health/health_${health}.png"))
+                    RenderSystem.setShader { GameRenderer.getPositionColorTexProgram() }
+                    RenderSystem.setShaderTexture(0, Identifier("scify", "healthmana/health/health_${health}.png"))
                     RenderSystem.setShaderColor(1f, 1f, 1f, 1f)
 
-                    BufferRenderer.drawWithGlobalProgram(buffer.end())
+                    tessellator.draw()
                 }
             }
         })

src/client/kotlin/chickenmanfy/scify/modules/Menu.kt

@@ -31,7 +31,7 @@ class Menu : Screen(Text.literal("SciFy Menu")) {
             0xff00ff
         )
 
-        val texture = Identifier.of("scify", "scify.png")
+        val texture = Identifier("scify", "scify.png")
         context.drawTexture(texture, width / 2 - 32, 20, 0F, 0F, 64, 64, 64, 64)
     }
     public override fun init() {

src/client/kotlin/chickenmanfy/scify/modules/Watermark.kt

@@ -3,7 +3,6 @@ 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 {
@@ -12,7 +11,7 @@ class Watermark {
     }
 
     fun watermark() {
-            HudRenderCallback.EVENT.register(HudRenderCallback { drawContext: DrawContext, _: RenderTickCounter ->
+            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" ||
@@ -20,8 +19,8 @@ class Watermark {
                     modDisableOverride) {
                     if (watermarkToggle) {
                         val minecraftClient = MinecraftClient.getInstance()
-                        val scifyVersion = "0.2.13-1.21.1"
-                        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)
+                        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)
                     }
                 }
             })

src/main/resources/fabric.mod.json

@@ -45,10 +45,10 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.6",
-		"minecraft": "~1.21.1",
+		"minecraft": "~1.20.4",
 		"java": ">=17",
 		"fabric-api": "*",
-		"fabric-language-kotlin": ">=1.11.0"
+		"fabric-language-kotlin": ">=1.9.22"
 	},
 	"suggests": {
 		"Mythicfy": "*"