1.21.11

Signed-off-by: Octol1ttle <[email protected]>

Author: Octol1ttle

build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
     id("dev.isxander.modstitch.base") version "0.7.0-unstable"
+    id("fabric-loom") version "1.14.6" apply false
     id("me.modmuss50.mod-publish-plugin")
     id("me.fallenbreath.yamlang") version "1.5.0"
 }
@@ -68,7 +69,7 @@ modstitch {
         modName = mod.name
         modVersion = mod.version
 
-        fun <K, V> MapProperty<K, V>.populate(block: MapProperty<K, V>.() -> Unit) {
+        fun <K : Any, V : Any> MapProperty<K, V>.populate(block: MapProperty<K, V>.() -> Unit) {
             block()
         }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -37,6 +37,7 @@ stonecutter {
         mc("1.21.1", "fabric", "neoforge")
         mc("1.21.6", "fabric")
         mc("1.21.9", "fabric")
+        mc("1.21.11", "fabric")
     }
 }
 

src/main/kotlin/net/minecraft/Util.kt

@@ -0,0 +1,5 @@
+package net.minecraft
+
+//? if >=1.21.11 {
+/*typealias Util = net.minecraft.util.Util
+//}*/

src/main/kotlin/net/minecraft/resources/ResourceLocation.kt

@@ -0,0 +1,4 @@
+package net.minecraft.resources
+
+//? if >=1.21.11
+/*typealias ResourceLocation = Identifier*/

src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistant.kt

@@ -15,6 +15,14 @@ import ru.octol1ttle.flightassistant.config.FAConfig
 import ru.octol1ttle.flightassistant.impl.computer.ComputerHost
 import ru.octol1ttle.flightassistant.impl.display.HudDisplayHost
 
+//? if >=1.21.11 {
+/*private val net.minecraft.client.Camera.xRot: Float
+    get() = this.xRot()
+
+private val net.minecraft.client.Camera.yRot: Float
+    get() = this.yRot()
+*///?}
+
 object FlightAssistant {
     const val MOD_ID: String = "flightassistant"
     internal val mc: Minecraft = Minecraft.getInstance()

src/main/kotlin/ru/octol1ttle/flightassistant/api/util/ScreenSpace.kt

@@ -86,6 +86,11 @@ object ScreenSpace {
         return vec.x.toInt()
     }
 
+    //? if >=1.21.11 {
+    /*private val net.minecraft.client.Camera.yRot: Float
+        get() = this.yRot()
+    *///?}
+
     fun getY(pitch: Float): Int? {
         val vec: Vector3f = fromWorldSpace(Vec3.directionFromRotation(-pitch, mc.entityRenderDispatcher.camera!!.yRot), true)
         if (!isVisible(vec)) {

src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/GuiGraphicsExtensions.kt

@@ -152,7 +152,11 @@ fun org.joml.Matrix3x2fStack.pop() {
 
 //? if >=1.21.9 {
 /*fun GuiGraphics.renderOutline(x: Int, y: Int, width: Int, height: Int, color: Int) {
-    submitOutline(x, y, width, height, color)
+//? if >=1.21.11 {
+    /^renderOutline(
+^///?} else
+    submitOutline(
+        x, y, width, height, color)
     renderDeferredElements()
 }
 *///?}

src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/CycleTextOnlyButton.kt

@@ -24,7 +24,11 @@ class CycleTextOnlyButton<E : NameableEnum>(x: Int, y: Int, private val entries:
         refreshMessage()
     }
 
-    override fun renderWidget(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
+//? if >=1.21.11 {
+    /*override fun renderContents(
+*///?} else
+    override fun renderWidget(
+        guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
         val message: Component = TextOnlyButton.getMessageComponent(this)
 
         this.width = font.width(message)

src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/SmartStringWidget.kt

@@ -3,6 +3,8 @@ package ru.octol1ttle.flightassistant.screen.components
 import net.minecraft.client.gui.components.StringWidget
 import net.minecraft.network.chat.Component
 import ru.octol1ttle.flightassistant.api.util.extensions.font
+//? if >=1.21.11
+/*import ru.octol1ttle.flightassistant.api.util.extensions.setColor*/
 
 class SmartStringWidget(x: Int, y: Int, component: Component) : StringWidget(x, y, font.width(component), font.lineHeight, component, font) {
     init {
@@ -25,4 +27,11 @@ class SmartStringWidget(x: Int, y: Int, component: Component) : StringWidget(x,
         this.x -= this.width
         return this
     }
+
+//? if >=1.21.11 {
+    /*fun setColor(color: Int): SmartStringWidget {
+        this.message = this.message.copy().setColor(color)
+        return this
+    }
+*///?}
 }