mojang mojang mojang mojang mojang

Octol1ttle · Octol1ttle · commit dabe134d59fc · 2025-07-15T15:39:47.000+05:00
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,8 +32,9 @@ stonecutter {
         }
         mc("1.20.1", "fabric", "forge")
         mc("1.21.1", "fabric", "neoforge")
-        mc("1.21.4", "fabric")
         mc("1.21.5", "fabric")
+        mc("1.21.6", "fabric")
     }
 }
+
 rootProject.name = "FlightAssistant"
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/GuiMixin.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/GuiMixin.java
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinLayeredDraw.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinLayeredDraw.java
@@ -0,0 +1,16 @@
+package ru.octol1ttle.flightassistant.mixin.gui;
+
+import net.minecraft.client.gui.Gui;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Gui.class)
+abstract class GuiMixinLayeredDraw {
+//? if fabric && >=1.21 && <1.21.6 {
+    /*@com.llamalad7.mixinextras.injector.ModifyReceiver(method = "<init>", at = @org.spongepowered.asm.mixin.injection.At(value = "INVOKE", target = "Lnet/minecraft/client/gui/LayeredDraw;add(Lnet/minecraft/client/gui/LayeredDraw$Layer;)Lnet/minecraft/client/gui/LayeredDraw;", ordinal = 2))
+    public net.minecraft.client.gui.LayeredDraw render(net.minecraft.client.gui.LayeredDraw instance, net.minecraft.client.gui.LayeredDraw.Layer layer) {
+        return instance.add((guiGraphics, deltaTracker)
+                -> ru.octol1ttle.flightassistant.api.util.event.FixedGuiRenderCallback.EVENT.invoker().onRenderGui(guiGraphics, deltaTracker.getGameTimeDeltaPartialTick(true))
+        );
+    }
+*///?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinLegacy.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinLegacy.java
@@ -0,0 +1,14 @@
+package ru.octol1ttle.flightassistant.mixin.gui;
+
+import net.minecraft.client.gui.Gui;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Gui.class)
+abstract class GuiMixinLegacy {
+//? if fabric && <1.21 {
+    @org.spongepowered.asm.mixin.injection.Inject(method = "render", at = @org.spongepowered.asm.mixin.injection.At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;getPlayerMode()Lnet/minecraft/world/level/GameType;", ordinal = 0))
+    private void render(net.minecraft.client.gui.GuiGraphics guiGraphics, float partialTick, org.spongepowered.asm.mixin.injection.callback.CallbackInfo callbackInfo) {
+        ru.octol1ttle.flightassistant.api.util.event.FixedGuiRenderCallback.EVENT.invoker().onRenderGui(guiGraphics, partialTick);
+    }
+//?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinNew.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/gui/GuiMixinNew.java
@@ -0,0 +1,15 @@
+package ru.octol1ttle.flightassistant.mixin.gui;
+
+import net.minecraft.client.gui.Gui;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Gui.class)
+abstract class GuiMixinNew {
+//? if fabric && >=1.21.6 {
+    /*@org.spongepowered.asm.mixin.injection.Inject(method = "render", at = @org.spongepowered.asm.mixin.injection.At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderHotbarAndDecorations(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V"))
+    private void beforeRenderHotbarAndDecorations(net.minecraft.client.gui.GuiGraphics guiGraphics, net.minecraft.client.DeltaTracker deltaTracker, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
+        ru.octol1ttle.flightassistant.api.util.event.FixedGuiRenderCallback.EVENT.invoker().onRenderGui(guiGraphics, deltaTracker.getGameTimeDeltaPartialTick(true));
+        guiGraphics.nextStratum();
+    }
+*///?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinLegacy.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinLegacy.java
@@ -0,0 +1,14 @@
+package ru.octol1ttle.flightassistant.mixin.level_renderer;
+
+import net.minecraft.client.renderer.LevelRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(LevelRenderer.class)
+abstract class LevelRendererMixinLegacy {
+//? if <1.21 {
+    @org.spongepowered.asm.mixin.injection.Inject(method = "renderLevel", at = @org.spongepowered.asm.mixin.injection.At("HEAD"))
+    private void onStartRender(com.mojang.blaze3d.vertex.PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, net.minecraft.client.Camera camera, net.minecraft.client.renderer.GameRenderer gameRenderer, net.minecraft.client.renderer.LightTexture lightTexture, org.joml.Matrix4f projectionMatrix, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
+        ru.octol1ttle.flightassistant.api.util.event.LevelRenderCallback.EVENT.invoker().onStartRenderLevel(partialTick, camera, projectionMatrix, com.mojang.blaze3d.systems.RenderSystem.getInverseViewRotationMatrix().invert());
+    }
+//?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinNew.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinNew.java
@@ -0,0 +1,14 @@
+package ru.octol1ttle.flightassistant.mixin.level_renderer;
+
+import net.minecraft.client.renderer.LevelRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(LevelRenderer.class)
+abstract class LevelRendererMixinNew {
+//? if >=1.21.2 && <1.21.6 {
+    /*@org.spongepowered.asm.mixin.injection.Inject(method = "renderLevel", at = @org.spongepowered.asm.mixin.injection.At("HEAD"))
+    private void onStartRender(com.mojang.blaze3d.resource.GraphicsResourceAllocator graphicsResourceAllocator, net.minecraft.client.DeltaTracker deltaTracker, boolean renderBlockOutline, net.minecraft.client.Camera camera, net.minecraft.client.renderer.GameRenderer gameRenderer, org.joml.Matrix4f frustumMatrix, org.joml.Matrix4f projectionMatrix, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
+        ru.octol1ttle.flightassistant.api.util.event.LevelRenderCallback.EVENT.invoker().onStartRenderLevel(deltaTracker.getGameTimeDeltaPartialTick(true), camera, projectionMatrix, frustumMatrix.get3x3(new org.joml.Matrix3f()));
+    }
+*///?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinNewest.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinNewest.java
@@ -0,0 +1,14 @@
+package ru.octol1ttle.flightassistant.mixin.level_renderer;
+
+import net.minecraft.client.renderer.LevelRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(LevelRenderer.class)
+abstract class LevelRendererMixinNewest {
+//? if >=1.21.6 {
+    /*@org.spongepowered.asm.mixin.injection.Inject(method = "renderLevel", at = @org.spongepowered.asm.mixin.injection.At("HEAD"))
+    private void onStartRender(com.mojang.blaze3d.resource.GraphicsResourceAllocator graphicsResourceAllocator, net.minecraft.client.DeltaTracker deltaTracker, boolean renderBlockOutline, net.minecraft.client.Camera camera, org.joml.Matrix4f frustumMatrix, org.joml.Matrix4f projectionMatrix, com.mojang.blaze3d.buffers.GpuBufferSlice fogBuffer, org.joml.Vector4f fogColor, boolean renderSky, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
+        ru.octol1ttle.flightassistant.api.util.event.LevelRenderCallback.EVENT.invoker().onStartRenderLevel(deltaTracker.getGameTimeDeltaPartialTick(true), camera, projectionMatrix, frustumMatrix.get3x3(new org.joml.Matrix3f()));
+    }
+*///?}
+}
diff --git a/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinOld.java b/src/main/java/ru/octol1ttle/flightassistant/mixin/level_renderer/LevelRendererMixinOld.java
@@ -0,0 +1,14 @@
+package ru.octol1ttle.flightassistant.mixin.level_renderer;
+
+import net.minecraft.client.renderer.LevelRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(LevelRenderer.class)
+abstract class LevelRendererMixinOld {
+//? if >=1.21 && <1.21.2 {
+    /*@org.spongepowered.asm.mixin.injection.Inject(method = "renderLevel", at = @org.spongepowered.asm.mixin.injection.At("HEAD"))
+    private void onStartRender(net.minecraft.client.DeltaTracker deltaTracker, boolean renderBlockOutline, net.minecraft.client.Camera camera, net.minecraft.client.renderer.GameRenderer gameRenderer, net.minecraft.client.renderer.LightTexture lightTexture, org.joml.Matrix4f frustumMatrix, org.joml.Matrix4f projectionMatrix, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
+        ru.octol1ttle.flightassistant.api.util.event.LevelRenderCallback.EVENT.invoker().onStartRenderLevel(deltaTracker.getGameTimeDeltaPartialTick(true), camera, projectionMatrix, frustumMatrix.get3x3(new org.joml.Matrix3f()));
+    }
+*///?}
+}
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/MathHelper.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/MathHelper.kt
@@ -10,6 +10,14 @@ fun degrees(value: Double): Double {
     return (value * (180.0 / PI))
 }
 
+fun radians(value: Float): Float {
+    return (value * (PI / 180.0)).toFloat()
+}
+
+fun radians(value: Double): Double {
+    return (value * (PI / 180.0))
+}
+
 fun furtherFromZero(value: Float): Int {
     return if (value < 0.0f) {
         floor(value).toInt()
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/GuiGraphicsExtensions.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/GuiGraphicsExtensions.kt
@@ -50,8 +50,8 @@ val warningColor: Int
  * Translates this graphics' pose and then scales it.
  */
 fun GuiGraphics.fusedTranslateScale(x: Float, y: Float, scale: Float) {
-    pose().translate(x, y, 0.0f)
-    pose().scale(scale, scale, 1.0f)
+    pose().translate(x, y /*? if <1.21.6 {*/, 0.0f /*?}*/)
+    pose().scale(scale, scale /*? if <1.21.6 {*/, 1.0f /*?}*/)
 }
 
 fun GuiGraphics.hLineDashed(
@@ -113,20 +113,33 @@ fun GuiGraphics.drawMiddleAlignedString(text: Component, x: Int, y: Int, color:
 }
 
 fun GuiGraphics.drawHighlightedCenteredText(text: Component, x: Int, y: Int, color: Int, highlight: Boolean) {
-    pose().pushPose()
+    pose().push()
 
     if (highlight) {
         val halfWidth: Int = textWidth(text) / 2
         fill(x - halfWidth - 1, y - 1, x + halfWidth + 2, y + 8, color)
-        pose().translate(0, 0, 100)
+//? if <1.21.6
+        pose().translate(0.0f, 0.0f, 100.0f)
         drawMiddleAlignedString(text, x, y, getContrasting(color))
     } else {
         drawMiddleAlignedString(text, x, y, color)
     }
 
-    pose().popPose()
+    pose().pop()
 }
 
-fun PoseStack.translate(x: Int, y: Int, z: Int) {
-    translate(x.toFloat(), y.toFloat(), z.toFloat())
+fun PoseStack.push() {
+    pushPose()
 }
+
+fun PoseStack.pop() {
+    popPose()
+}
+
+fun org.joml.Matrix3x2fStack.push() {
+    pushMatrix()
+}
+
+fun org.joml.Matrix3x2fStack.pop() {
+    popMatrix()
+}
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AltitudeDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AltitudeDisplay.kt
@@ -29,7 +29,7 @@ class AltitudeDisplay(computers: ComputerView) : Display(computers) {
     }
 
     private fun GuiGraphics.renderAltitudeReading(x: Float, y: Float) {
-        pose().pushPose()
+        pose().push()
         fusedTranslateScale(x, y, READING_MATRIX_SCALE)
 
         val altitude: Double = computers.data.altitude
@@ -42,7 +42,7 @@ class AltitudeDisplay(computers: ComputerView) : Display(computers) {
         val textY: Int = -4
         drawString(text, 3, textY, primaryColor)
 
-        pose().popPose()
+        pose().pop()
     }
 
     private fun GuiGraphics.renderAltitudeScale(x: Int, y: Int) {
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AttitudeDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AttitudeDisplay.kt
@@ -23,8 +23,12 @@ class AttitudeDisplay(computers: ComputerView) : Display(computers) {
 
     override fun render(guiGraphics: GuiGraphics) {
         with(guiGraphics) {
-            pose().pushPose()
-            pose().translate(0, 0, -200)
+            pose().push()
+//? if <1.21.6
+            pose().translate(0.0f, 0.0f, -200.0f)
+//? if >=1.21.6 {
+            /*pose().rotateAbout(ru.octol1ttle.flightassistant.api.util.radians(-computers.data.roll), centerXF, centerYF)
+*///?} else
             pose().rotateAround(Axis.ZN.rotationDegrees(computers.data.roll), centerXF, centerYF, 0.0f)
 
             if (FAConfig.display.showAttitude <= DisplayOptions.AttitudeDisplayMode.HORIZON_ONLY) {
@@ -35,7 +39,7 @@ class AttitudeDisplay(computers: ComputerView) : Display(computers) {
                 renderPitchLimits()
             }
 
-            pose().popPose()
+            pose().pop()
         }
     }
 
@@ -101,13 +105,16 @@ class AttitudeDisplay(computers: ComputerView) : Display(computers) {
         }
         while (min >= -180) {
             val y: Int = ScreenSpace.getY(min) ?: break
-            pose().pushPose()
+            pose().push()
 
-            pose().translate(centerX, y, 0) // Rotate around the middle of the arrow
+            pose().translate(centerXF, y.toFloat() /*? if <1.21.6 {*/, 0.0f /*?}*/) // Rotate around the middle of the arrow
+//? if >=1.21.6 {
+            /*pose().rotate(ru.octol1ttle.flightassistant.api.util.radians(180.0f))
+*///?} else
             pose().mulPose(Axis.ZN.rotationDegrees(180.0f)) // Flip upside down
             drawMiddleAlignedString(arrowText, 0, -9, if (minInput?.active == true) warningColor else cautionColor)
 
-            pose().popPose()
+            pose().pop()
             min -= step
         }
 
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightDirectorsDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightDirectorsDisplay.kt
@@ -29,8 +29,9 @@ class FlightDirectorsDisplay(computers: ComputerView) : Display(computers) {
         with(guiGraphics) {
             val halfWidth: Int = (HudFrame.width / 10.0f).toInt()
 
-            pose().pushPose()
-            pose().translate(0, 0, -100)
+            pose().push()
+//? if <1.21.6
+            pose().translate(0.0f, 0.0f, -100.0f)
             enableScissor(HudFrame.left, HudFrame.top, HudFrame.right, HudFrame.bottom)
 
             if (computers.pitch.activeInput?.identifier == AutopilotLogicComputer.ID) {
@@ -48,7 +49,7 @@ class FlightDirectorsDisplay(computers: ComputerView) : Display(computers) {
             }
 
             disableScissor()
-            pose().popPose()
+            pose().pop()
         }
     }
 
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightPathDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightPathDisplay.kt
@@ -22,8 +22,9 @@ class FlightPathDisplay(computers: ComputerView) : Display(computers) {
             val trueX: Float = screenSpaceVec.x
             val trueY: Float = screenSpaceVec.y
 
-            pose().pushPose()
-            pose().translate(0, 0, -150)
+            pose().push()
+//? if <1.21.6
+            pose().translate(0.0f, 0.0f, -150.0f)
             fusedTranslateScale(trueX, trueY, FAConfig.display.flightPathVectorSize)
 
             val bodySideSize = 3
@@ -39,7 +40,7 @@ class FlightPathDisplay(computers: ComputerView) : Display(computers) {
             hLine(-bodySideSize - wingSize, -bodySideSize, 0, primaryColor)
             hLine(bodySideSize, bodySideSize + wingSize, 0, primaryColor)
 
-            pose().popPose()
+            pose().pop()
         }
     }
 
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/SpeedDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/SpeedDisplay.kt
@@ -28,7 +28,7 @@ class SpeedDisplay(computers: ComputerView) : Display(computers) {
     }
 
     private fun GuiGraphics.renderSpeedReading(x: Float, y: Float) {
-        pose().pushPose()
+        pose().push()
         fusedTranslateScale(x * 1.005f, y, READING_MATRIX_SCALE)
 
         val speed: Double = computers.data.forwardVelocity.length() * 20
@@ -44,7 +44,7 @@ class SpeedDisplay(computers: ComputerView) : Display(computers) {
         renderOutline(-width, -halfHeight, width, halfHeight * 2 - 1, color)
         drawRightAlignedString(text, -2, textY, color)
 
-        pose().popPose()
+        pose().pop()
     }
 
     private fun GuiGraphics.renderSpeedScale(x: Int, y: Int) {
diff --git a/src/main/resources/flightassistant.client.mixins.json b/src/main/resources/flightassistant.client.mixins.json
@@ -4,11 +4,16 @@
     "compatibilityLevel": "JAVA_17",
     "client": [
         "ClientLevelRunningNormallyInvoker",
-        "EntityTurnMixin",
         "EntityInvoker",
+        "EntityTurnMixin",
         "FireworkRocketEntityMixin",
-        "GuiMixin",
-        "LevelRendererMixin",
+        "gui.GuiMixinLayeredDraw",
+        "gui.GuiMixinLegacy",
+        "gui.GuiMixinNew",
+        "level_renderer.LevelRendererMixinLegacy",
+        "level_renderer.LevelRendererMixinNew",
+        "level_renderer.LevelRendererMixinNewest",
+        "level_renderer.LevelRendererMixinOld",
         "sound.SoundEngineMixin",
         "sound.SoundManagerMixin"
     ],
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -25,12 +25,12 @@ allprojects {
         mavenCentral()
         strictMaven("https://maven.architectury.dev/", "dev.architectury")
         strictMaven("https://maven.fabricmc.net/", "net.fabricmc")
-        strictMaven("https://oss.sonatype.org/content/repositories/snapshots", "me.lucko")
         strictMaven("https://maven.isxander.dev/releases", "dev.isxander", "org.quiltmc.parsers")
         strictMaven("https://thedarkcolour.github.io/KotlinForForge/", "thedarkcolour")
         strictMaven("https://maven.terraformersmc.com/releases/", "com.terraformersmc")
         strictMaven("https://maven.enjarai.dev/releases/", "nl.enjarai")
         maven("https://maven.enjarai.dev/mirrors")
         maven("https://maven.neoforged.net/releases")
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
     }
 }
diff --git a/versions/1.21.4-fabric/gradle.properties b/versions/1.21.4-fabric/gradle.properties
diff --git a/versions/1.21.5-fabric/gradle.properties b/versions/1.21.5-fabric/gradle.properties
@@ -10,6 +10,6 @@ deps.modmenu=14.0.0-rc.2
 deps.dabr=3.8.1+1.21.5-fabric
 
 # Mod
-mod.mc_version_range=>=1.21.5 <1.22
+mod.mc_version_range=1.21.5
 mod.mc_title=1.21.5
 mod.mc_targets=1.21.5
diff --git a/versions/1.21.6-fabric/gradle.properties b/versions/1.21.6-fabric/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ stonecutter {`
`32`	`32`	`}`
`33`	`33`	`mc("1.20.1", "fabric", "forge")`
`34`	`34`	`mc("1.21.1", "fabric", "neoforge")`
`35`		`- mc("1.21.4", "fabric")`
`36`	`35`	`mc("1.21.5", "fabric")`
	`36`	`+ mc("1.21.6", "fabric")`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
`39`	`40`	`rootProject.name = "FlightAssistant"`