From fbb2c9f4faea775f47da8b5dfd533dbc5c10956a Mon Sep 17 00:00:00 2001 From: moonleay Date: Sun, 17 Dec 2023 15:53:41 +0100 Subject: [PATCH] chore: upgraded mod to 1.20.2 --- build.gradle.kts | 2 +- gradle.properties | 10 +++++----- .../moonleay/etaorion/client/screen/AutoTextScreen.kt | 2 +- .../moonleay/etaorion/client/screen/OptionScreen.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c009a7f..d950c4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { id("org.jetbrains.gradle.plugin.idea-ext") } -val mavenVersion = System.getenv("CI_COMMIT_TAG") ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } ?: "0.3.0-snap" +val mavenVersion = System.getenv("CI_COMMIT_TAG") ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } ?: "0.4.0-snap" val modId: String by project val modName: String by project diff --git a/gradle.properties b/gradle.properties index ef0132e..3a67a75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ #Wed Jul 26 02:02:24 CEST 2023 fabric.loom.version=1.+ kotlin.version=1.9.0 -fabric.api.version=0.86.1+1.20.1 -yarn.version=1.20.1+build.10 -configlib.version=3.0.0-beta +fabric.api.version=0.91.1+1.20.2 +yarn.version=1.20.2+build.4 +configlib.version=e89c979e-dev idea-ext.version=1.1.6 org.gradle.jvmargs=-Xmx1G modId=etaorion @@ -12,7 +12,7 @@ kotlinx.serialization.version=1.5.1 fabric.kotlin.version=1.10.8+kotlin.1.9.0 mavenGroup=net.moonleay kotlin.code.style=official -minecraft.version=1.20.1 +minecraft.version=1.20.2 modName=EtaOrionFabric2 -fabric.loader.version=0.14.21 +fabric.loader.version=0.15.0 mavenArtifact=etaorionfabric diff --git a/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt b/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt index a841101..944cefc 100644 --- a/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt +++ b/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt @@ -68,7 +68,7 @@ class AutoTextScreen(val parent: Screen) : Screen(Text.of("AutoText Manager")) { override fun tick() { - addressField!!.tick() +// addressField!!.tick() } override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean { diff --git a/src/main/java/net/moonleay/etaorion/client/screen/OptionScreen.kt b/src/main/java/net/moonleay/etaorion/client/screen/OptionScreen.kt index 33b0e79..ee63a2d 100644 --- a/src/main/java/net/moonleay/etaorion/client/screen/OptionScreen.kt +++ b/src/main/java/net/moonleay/etaorion/client/screen/OptionScreen.kt @@ -38,8 +38,8 @@ class OptionScreen(val parent: Screen) : Screen(Text.of("EtaOrion Fabric Options MinecraftClient.getInstance().setScreen(parent) } - override fun render(context: DrawContext?, mouseX: Int, mouseY: Int, delta: Float) { - this.renderBackground(context) + override fun render(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) { + this.renderBackground(context, mouseX, mouseY, delta) //drawCenteredText(matrices, this.textRenderer, this.title, this.width / 2, 15, 0xFFFFFF); optionList!!.render(context, mouseX, mouseY, delta) context?.drawCenteredTextWithShadow(