diff --git a/build.gradle.kts b/build.gradle.kts index 26b29a2..8a891c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -196,7 +196,7 @@ allprojects { } val modProperties = mapOf( "mod_version" to (rootProject.version as String), - "minecraft_version" to minecraftVersion, + "minecraft_version" to minecraftVersion.replace("snapshot-", "alpha."), "java_version" to javaVer, "mod_group" to this@allprojects.group, "fabric_kotlin" to rootProject.property("fabric_language_kotlin"), diff --git a/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt b/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt index 5cab12d..1a53425 100644 --- a/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt +++ b/common/src/main/kotlin/fr/username404/snowygui/config/ConfigScreen.kt @@ -29,7 +29,7 @@ val SnowyConfigScreen: Screen = object: Screen(translationComponent) { color = Colors.WHITE, scaleFactor = 0.85F ) } - override fun onClose() { minecraft?.screen = configScreenParent } + override fun onClose() = minecraft.gui.setScreen(configScreenParent) }; get() = try { Class.forName("me.shedaniel.clothconfig2.api.ConfigBuilder") val macrosBox: ClickBox? = ClickGui.components.find { diff --git a/common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImplWithHud.kt b/common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImplWithHud.kt index 1abf738..ac1e8eb 100644 --- a/common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImplWithHud.kt +++ b/common/src/main/kotlin/fr/username404/snowygui/gui/feature/ButtonImplWithHud.kt @@ -9,7 +9,7 @@ import net.minecraft.client.gui.GuiGraphicsExtractor as GuiGraphics sealed class ButtonImplWithHud: ButtonImpl() { protected abstract val hudRenderLambda: Renderable private val generatedLambda: argsLambda = { - if (!Minecraft.getInstance().options.hideGui) { + if (!Minecraft.getInstance().gui.hud.isHidden) { hudRenderLambda.render(it.first() as GuiGraphics?) } } diff --git a/common/src/main/kotlin/fr/username404/snowygui/misc/AddKeyMaps.kt b/common/src/main/kotlin/fr/username404/snowygui/misc/AddKeyMaps.kt index b29ccc2..a8e81d9 100644 --- a/common/src/main/kotlin/fr/username404/snowygui/misc/AddKeyMaps.kt +++ b/common/src/main/kotlin/fr/username404/snowygui/misc/AddKeyMaps.kt @@ -29,8 +29,11 @@ object AddKeyMaps { ) to lambda val list: MutableMap = with(Minecraft.getInstance()) { mutableMapOf( - mkMap("opengui", GLFW_KEY_Y) { setScreen(ClickGui) }, - mkMap("configkey", GLFW_KEY_U) { setScreen(run { configScreenParent = null; SnowyConfigScreen }) } + mkMap("opengui", GLFW_KEY_Y) { Minecraft.getInstance().setScreenAndShow(ClickGui) }, + mkMap("configkey", GLFW_KEY_U) { + configScreenParent = null + Minecraft.getInstance().setScreenAndShow(SnowyConfigScreen) + } ) } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1baad01..f2fef5c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,8 @@ org.gradle.parallel=true org.gradle.unsafe.configuration-cache=on org.gradle.vfs.watch=true -minecraft=26.1 +minecraft=26.2-snapshot-1 +# TODO: 26.2.0.1-beta forge_version=26.1.0.19-beta kotlinforforge=6.2.0 kotlinVer=2.3.10 @@ -15,8 +16,8 @@ kotlin_coroutines_version=1.10.2 serializationVer=1.10.0 fabric_loader_version=0.19.1 fabric_language_kotlin=1.13.9+kotlin.2.3.10 -fabric_resource_loader_version=3.3.16+4fc5413f59 -fabric_rendering_api_version=23.0.3+2fb0624759 -fabric_api_base_version=2.0.3+ece0632359 +fabric_resource_loader_version=3.3.16+4fc5413f92 +fabric_rendering_api_version=23.0.5+086d547a92 +fabric_api_base_version=2.0.3+ece0632392 clothconfig_version=26.1.154 modmenu_version=18.0.0-alpha.8 diff --git a/settings.gradle.kts b/settings.gradle.kts index 9e703d2..565d423 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ pluginManagement { include("common") include("fabric") -include("neoforge") +//include("neoforge") rootProject.name = "SnowyGUI"