Updated Fabric to 1.21.6

ya-ilya · ya-ilya · commit ff24ef9f03b4 · 2025-07-07T01:02:12.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -12,11 +12,11 @@ progresoVersion=0.3.1
 
 # fabric
 fabric.loom.multiProjectOptimisation=true
-minecraftVersion=1.21.5
-fabricVersion=0.119.6+1.21.5
+minecraftVersion=1.21.6
+fabricVersion=0.128.1+1.21.6
 fabricLoomVersion=1.10-SNAPSHOT
-yarnMappings=1.21.5+build.1
-loaderVersion=0.16.10
+yarnMappings=1.21.6+build.1
+loaderVersion=0.16.14
 
 # other
 gsonVersion=2.11.0
diff --git a/progreso-client/src/main/java/org/progreso/client/mixins/gui/MixinScreen.java b/progreso-client/src/main/java/org/progreso/client/mixins/gui/MixinScreen.java
@@ -1,32 +1,30 @@
 package org.progreso.client.mixins.gui;
 
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.Style;
 import org.progreso.api.managers.CommandManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen {
     @Inject(
-        method = "handleTextClick",
+        method = "handleBasicClickEvent",
         at = @At(
             value = "INVOKE",
             target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V",
-            ordinal = 1,
             remap = false
-        ),
-        cancellable = true
+        )
     )
-    private void handleTextClickHook(Style style, CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
-        ClickEvent event = style.getClickEvent();
-        if (event instanceof ClickEvent.RunCommand runCommand) {
-            if (runCommand.command().startsWith(CommandManager.PREFIX)) {
-                CommandManager.INSTANCE.dispatch(runCommand.command());
-                callbackInfoReturnable.setReturnValue(true);
+    private static void handleBasicClickEventHook(ClickEvent event, MinecraftClient client, Screen screenAfterRun, CallbackInfo callbackInfo) {
+        if (event instanceof ClickEvent.RunCommand(String command)) {
+            if (command.startsWith(CommandManager.PREFIX)) {
+                CommandManager.INSTANCE.dispatch(command);
             }
         }
     }
diff --git a/progreso-client/src/main/java/org/progreso/client/mixins/render/MixinGameRenderer.java b/progreso-client/src/main/java/org/progreso/client/mixins/render/MixinGameRenderer.java
@@ -37,10 +37,9 @@ private static void getNightVisionStrengthHook(
     @Inject(
         method = "renderWorld",
         at = @At(
-            value = "FIELD",
-            target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z",
-            opcode = Opcodes.GETFIELD,
-            ordinal = 0
+            value = "INVOKE_STRING",
+            target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
+            args = {"ldc=hand"}
         )
     )
     public void renderWorldHook(
diff --git a/progreso-client/src/main/java/org/progreso/client/mixins/sound/MixinSoundSystem.java b/progreso-client/src/main/java/org/progreso/client/mixins/sound/MixinSoundSystem.java
@@ -8,17 +8,18 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(SoundSystem.class)
 public abstract class MixinSoundSystem {
     @Inject(
-        method = "play(Lnet/minecraft/client/sound/SoundInstance;)V",
+        method = "play(Lnet/minecraft/client/sound/SoundInstance;)Lnet/minecraft/client/sound/SoundSystem$PlayResult;",
         at = @At("HEAD"),
         cancellable = true
     )
-    public void playHook(SoundInstance sound, CallbackInfo callbackInfo) {
+    public void playHook(SoundInstance sound, CallbackInfoReturnable<SoundSystem.PlayResult> callbackInfoReturnable) {
         if (Client.EVENT_BUS.post(new SoundEvent(sound))) {
-            callbackInfo.cancel();
+            callbackInfoReturnable.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);
         }
     }
 }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/accessors/CommandAccessor.kt b/progreso-client/src/main/kotlin/org/progreso/client/accessors/CommandAccessor.kt
@@ -10,7 +10,7 @@ import java.util.concurrent.CompletableFuture
 
 object CommandAccessor : CommandAccessor {
     override fun createCommandSource(): Any {
-        return ClientCommandSource(null, mc.client)
+        return ClientCommandSource(null, mc.client, false)
     }
 
     override fun suggestMatching(
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/BooleanElement.kt b/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/BooleanElement.kt
@@ -6,7 +6,7 @@ import org.progreso.client.gui.clickgui.element.ParentElement
 import org.progreso.client.gui.drawRect
 import org.progreso.client.gui.drawTextRelatively
 import org.progreso.client.gui.invoke
-import org.progreso.client.util.render.drawCircle
+import org.progreso.client.util.render.drawEllipse
 import org.progreso.client.util.render.render2D
 import java.awt.Color
 
@@ -42,11 +42,11 @@ class BooleanElement(
         )
 
         render2D(context) {
-            drawCircle(
-                buttonStartX + if (setting.value) BUTTON_WIDTH else 0,
-                buttonStartY + 2,
-                0.0, 360.0,
-                40, 3.0,
+            drawEllipse(
+                (buttonStartX + if (setting.value) BUTTON_WIDTH else 0).toFloat() - 2.5f,
+                (buttonStartY + 2).toFloat() - 2.5f,
+                5f,
+                5f,
                 mainColor
             )
         }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/ColorElement.kt b/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/ColorElement.kt
@@ -9,7 +9,7 @@ import org.progreso.client.gui.clickgui.element.ParentElement
 import org.progreso.client.gui.drawRect
 import org.progreso.client.gui.drawTextRelatively
 import org.progreso.client.gui.invoke
-import org.progreso.client.util.render.drawCircle
+import org.progreso.client.util.render.drawEllipse
 import org.progreso.client.util.render.drawPicker
 import org.progreso.client.util.render.render2D
 import java.awt.Color
@@ -119,11 +119,11 @@ class ColorElement(
                 )
 
                 render2D(context) {
-                    drawCircle(
-                        x + width - 9,
-                        y + height.div(2),
-                        0.0, 360.0,
-                        40, 2.6,
+                    drawEllipse(
+                        (x + width - 9).toFloat() - 2.5f,
+                        (y + height.div(2)).toFloat() - 2.5f,
+                        5f,
+                        5f,
                         setting.value
                     )
                 }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/SliderElement.kt b/progreso-client/src/main/kotlin/org/progreso/client/gui/clickgui/element/elements/SliderElement.kt
@@ -7,7 +7,7 @@ import org.progreso.client.gui.drawRect
 import org.progreso.client.gui.drawTextRelatively
 import org.progreso.client.gui.getTextWidth
 import org.progreso.client.gui.invoke
-import org.progreso.client.util.render.drawCircle
+import org.progreso.client.util.render.drawEllipse
 import org.progreso.client.util.render.render2D
 import java.awt.Color
 import kotlin.math.floor
@@ -93,11 +93,11 @@ class SliderElement(
             )
 
             render2D(context) {
-                drawCircle(
-                    sliderStartX + sliderWidth,
-                    sliderStartY + SLIDER_HEIGHT / 2,
-                    0.0, 360.0,
-                    40, 2.6,
+                drawEllipse(
+                    (sliderStartX + sliderWidth).toFloat() - 2.5f,
+                    (sliderStartY + SLIDER_HEIGHT / 2).toFloat() - 2.5f,
+                    5f,
+                    5f,
                     mainColor
                 )
             }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/modules/render/StorageESP.kt b/progreso-client/src/main/kotlin/org/progreso/client/modules/render/StorageESP.kt
@@ -14,7 +14,6 @@ import org.progreso.client.util.render.drawOutlinedBox
 import org.progreso.client.util.render.drawSolidBox
 import org.progreso.client.util.render.render3D
 import org.progreso.client.util.render.withRelativeToCameraPosition
-import org.progreso.client.util.world.blockEntities
 import java.awt.Color
 import java.util.concurrent.ConcurrentHashMap
 
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2D.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2D.kt
@@ -2,53 +2,44 @@ package org.progreso.client.util.render
 
 import net.minecraft.client.font.*
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.texture.TextureSetup
 import net.minecraft.resource.ResourceManager
 import net.minecraft.util.Identifier
+import org.joml.Matrix3x2f
 import org.progreso.client.Client
-import org.progreso.client.gui.glColors
 import org.progreso.client.managers.ProgresoResourceManager
+import org.progreso.client.util.render.elements.EllipseElementRenderState
+import org.progreso.client.util.render.elements.PickerElementRenderState
 import java.awt.Color
-import kotlin.math.cos
-import kotlin.math.sin
 
 data class Render2DContext(val context: DrawContext)
 
 fun render2D(context: DrawContext, block: Render2DContext.() -> Unit) {
-    context.matrices.push()
+    context.matrices.pushMatrix()
     block(Render2DContext(context))
-    context.matrices.pop()
+    context.matrices.popMatrix()
 }
 
-fun Render2DContext.drawCircle(
-    centerX: Int,
-    centerY: Int,
-    angleFrom: Double,
-    angleTo: Double,
-    segments: Int,
-    radius: Double,
+fun Render2DContext.drawEllipse(
+    x: Float,
+    y: Float,
+    width: Float,
+    height: Float,
     color: Color
 ) {
-    val (red, green, blue, alpha) = color.glColors
-    val matrix = context.matrices.peek().positionMatrix
-
-    val angleStep = Math.toRadians(angleTo - angleFrom) / segments
-
-    val layer = Render2DLayers.getTriangles()
-    val buffer = context.vertexConsumers.getBuffer(layer)
-    buffer
-        .vertex(matrix, centerX.toFloat(), centerY.toFloat(), 0f)
-        .color(red, green, blue, alpha)
-
-    for (i in segments downTo 0) {
-        val theta = Math.toRadians(angleFrom) + i * angleStep
-        buffer.vertex(
-            matrix,
-            (centerX - cos(theta) * radius).toFloat(),
-            (centerY - sin(theta) * radius).toFloat(), 0f
-        ).color(red, green, blue, alpha)
-    }
-
-    context.vertexConsumers.draw(layer)
+    context.state.addSimpleElement(
+        EllipseElementRenderState(
+            Render2DShaderPipelines.ELLIPSE_PIPELINE,
+            TextureSetup.empty(),
+            Matrix3x2f(context.matrices),
+            x,
+            y,
+            width,
+            height,
+            color,
+            context.scissorStack.peekLast()
+        )
+    )
 }
 
 fun Render2DContext.drawPicker(
@@ -58,50 +49,19 @@ fun Render2DContext.drawPicker(
     height: Float,
     color: Color
 ) {
-    val (red, green, blue, alpha) = color.glColors
-    val matrix = context.matrices.peek().positionMatrix
-
-    var layer = Render2DLayers.getQuads()
-    var buffer = context.vertexConsumers.getBuffer(layer)
-
-    buffer
-        .vertex(matrix, x, y, 0f)
-        .color(1f, 1f, 1f, 1f)
-
-    buffer
-        .vertex(matrix, x, y + height, 0f)
-        .color(1f, 1f, 1f, 1f)
-
-    buffer
-        .vertex(matrix, x + width, y + height, 0f)
-        .color(red, green, blue, alpha)
-
-    buffer
-        .vertex(matrix, x + width, y, 0f)
-        .color(red, green, blue, alpha)
-
-    context.vertexConsumers.draw(layer)
-
-    layer = Render2DLayers.getQuads()
-    buffer = context.vertexConsumers.getBuffer(layer)
-
-    buffer
-        .vertex(matrix, x, y, 0f)
-        .color(0f, 0f, 0f, 0f)
-
-    buffer
-        .vertex(matrix, x, y + height, 0f)
-        .color(0f, 0f, 0f, 1f)
-
-    buffer
-        .vertex(matrix, x + width, y + height, 0f)
-        .color(0f, 0f, 0f, 1f)
-
-    buffer
-        .vertex(matrix, x + width, y, 0f)
-        .color(0f, 0f, 0f, 0f)
-
-    context.vertexConsumers.draw(layer)
+    context.state.addSimpleElement(
+        PickerElementRenderState(
+            Render2DShaderPipelines.PICKER_PIPELINE,
+            TextureSetup.empty(),
+            Matrix3x2f(context.matrices),
+            x,
+            y,
+            width,
+            height,
+            color,
+            context.scissorStack.peekLast()
+        )
+    )
 }
 
 fun createTextRenderer(
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2DLayers.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2DLayers.kt
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2DShaderPipelines.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render2DShaderPipelines.kt
@@ -1,25 +1,30 @@
 package org.progreso.client.util.render
 
+import com.mojang.blaze3d.pipeline.BlendFunction
 import com.mojang.blaze3d.pipeline.RenderPipeline
 import com.mojang.blaze3d.platform.DepthTestFunction
 import com.mojang.blaze3d.vertex.VertexFormat
 import net.minecraft.client.gl.RenderPipelines
 import net.minecraft.client.render.VertexFormats
+import net.minecraft.util.Identifier
 
 object Render2DShaderPipelines {
-    val TRIANGLES: RenderPipeline = RenderPipelines
+    val ELLIPSE_PIPELINE: RenderPipeline = RenderPipelines
         .register(
-            RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
-                .withLocation("pipeline/progreso_triangles_2d")
-                .withVertexFormat(VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.TRIANGLE_FAN)
-                .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
+            RenderPipeline.builder(RenderPipelines.TRANSFORMS_AND_PROJECTION_SNIPPET)
+                .withBlend(BlendFunction.TRANSLUCENT)
+                .withVertexFormat(VertexFormats.POSITION_TEXTURE_COLOR, VertexFormat.DrawMode.QUADS)
+                .withCull(true)
+                .withFragmentShader(Identifier.of("progreso", "core/rendertype_ellipse"))
+                .withVertexShader("core/position_tex_color")
+                .withLocation(Identifier.of("progreso", "pipeline/2d/quad_ellipse"))
                 .build()
         )
 
-    val QUADS: RenderPipeline = RenderPipelines
+    val PICKER_PIPELINE: RenderPipeline = RenderPipelines
         .register(
             RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
-                .withLocation("pipeline/progreso_quads_2d")
+                .withLocation(Identifier.of("progreso", "pipeline/2d/quad_picker"))
                 .withVertexFormat(VertexFormats.POSITION_COLOR, VertexFormat.DrawMode.QUADS)
                 .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
                 .build()
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/elements/EllipseElementRenderState.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/elements/EllipseElementRenderState.kt
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/elements/PickerElementRenderState.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/elements/PickerElementRenderState.kt
diff --git a/progreso-client/src/main/resources/assets/progreso/shaders/core/rendertype_ellipse.fsh b/progreso-client/src/main/resources/assets/progreso/shaders/core/rendertype_ellipse.fsh
diff --git a/progreso-client/src/main/resources/progreso.accesswidener b/progreso-client/src/main/resources/progreso.accesswidener

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,9 @@ private static void getNightVisionStrengthHook(`
`37`	`37`	`@Inject(`
`38`	`38`	`method = "renderWorld",`
`39`	`39`	`at = @At(`
`40`		`- value = "FIELD",`
`41`		`- target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z",`
`42`		`- opcode = Opcodes.GETFIELD,`
`43`		`- ordinal = 0`
	`40`	`+ value = "INVOKE_STRING",`
	`41`	`+ target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",`
	`42`	`+ args = {"ldc=hand"}`
`44`	`43`	`)`
`45`	`44`	`)`
`46`	`45`	`public void renderWorldHook(`
Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,18 @@`
`8`	`8`	`import org.spongepowered.asm.mixin.injection.At;`
`9`	`9`	`import org.spongepowered.asm.mixin.injection.Inject;`
`10`	`10`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;`
	`11`	`+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;`
`11`	`12`
`12`	`13`	`@Mixin(SoundSystem.class)`
`13`	`14`	`public abstract class MixinSoundSystem {`
`14`	`15`	`@Inject(`
`15`		`- method = "play(Lnet/minecraft/client/sound/SoundInstance;)V",`
	`16`	`+ method = "play(Lnet/minecraft/client/sound/SoundInstance;)Lnet/minecraft/client/sound/SoundSystem$PlayResult;",`
`16`	`17`	`at = @At("HEAD"),`
`17`	`18`	`cancellable = true`
`18`	`19`	`)`
`19`		`- public void playHook(SoundInstance sound, CallbackInfo callbackInfo) {`
	`20`	`+ public void playHook(SoundInstance sound, CallbackInfoReturnable<SoundSystem.PlayResult> callbackInfoReturnable) {`
`20`	`21`	`if (Client.EVENT_BUS.post(new SoundEvent(sound))) {`
`21`		`- callbackInfo.cancel();`
	`22`	`+ callbackInfoReturnable.setReturnValue(SoundSystem.PlayResult.NOT_STARTED);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import java.util.concurrent.CompletableFuture`
`10`	`10`
`11`	`11`	`object CommandAccessor : CommandAccessor {`
`12`	`12`	`override fun createCommandSource(): Any {`
`13`		`- return ClientCommandSource(null, mc.client)`
	`13`	`+ return ClientCommandSource(null, mc.client, false)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`override fun suggestMatching(`