Updated Fabric to 1.21.11

Author: ya-ilya

gradle.properties

@@ -12,11 +12,11 @@ progresoVersion=0.3.1
 
 # fabric
 fabric.loom.multiProjectOptimisation=true
-minecraftVersion=1.21.10
-fabricVersion=0.135.0+1.21.10
-fabricLoomVersion=1.11-SNAPSHOT
-yarnMappings=1.21.10+build.2
-loaderVersion=0.17.3
+minecraftVersion=1.21.11
+fabricVersion=0.139.4+1.21.11
+fabricLoomVersion=1.14-SNAPSHOT
+yarnMappings=1.21.11+build.2
+loaderVersion=0.18.2
 
 # other
 gsonVersion=2.11.0

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
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

progreso-client/src/main/java/org/progreso/client/mixins/render/MixinGameRenderer.java

@@ -44,13 +44,12 @@ private static void getNightVisionStrengthHook(
     public void renderWorldHook(
         RenderTickCounter tickCounter,
         CallbackInfo callbackInfo,
-        @Local(ordinal = 1) Matrix4f matrix4f2,
-        @Local(ordinal = 1) float tickDelta
+        @Local(ordinal = 1) Matrix4f matrix4f2
     ) {
         Profilers.get().push("progreso_3d_render");
         MatrixStack matrixStack = new MatrixStack();
         matrixStack.multiplyPositionMatrix(matrix4f2);
-        Client.EVENT_BUS.post(new Render3DEvent(matrixStack, tickDelta));
+        Client.EVENT_BUS.post(new Render3DEvent(matrixStack, tickCounter.getTickProgress(false)));
         Profilers.get().pop();
     }
 }

progreso-client/src/main/kotlin/org/progreso/client/accessors/CommandAccessor.kt

@@ -4,13 +4,14 @@ import com.mojang.brigadier.suggestion.Suggestions
 import com.mojang.brigadier.suggestion.SuggestionsBuilder
 import net.minecraft.client.network.ClientCommandSource
 import net.minecraft.command.CommandSource
+import net.minecraft.command.permission.PermissionPredicate
 import org.progreso.api.accessor.CommandAccessor
 import org.progreso.client.Client.Companion.mc
 import java.util.concurrent.CompletableFuture
 
 object CommandAccessor : CommandAccessor {
     override fun createCommandSource(): Any {
-        return ClientCommandSource(null, mc.client, false)
+        return ClientCommandSource(null, mc.client, PermissionPredicate.NONE)
     }
 
     override fun suggestMatching(

progreso-client/src/main/kotlin/org/progreso/client/gui/builders/ButtonBuilder.kt

@@ -4,7 +4,6 @@ import net.minecraft.client.gui.Click
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.widget.ButtonWidget
-import net.minecraft.text.Text
 import org.progreso.api.gui.builders.AbstractButtonBuilder
 import org.progreso.client.accessors.TextAccessor.i18n
 
@@ -27,7 +26,7 @@ class ButtonBuilder : AbstractButtonBuilder<DrawContext, ButtonWidget>() {
             y,
             width,
             height,
-            Text.of(text),
+            net.minecraft.text.Text.of(text),
             { buttonListeners.onPress(it) },
             DEFAULT_NARRATION_SUPPLIER
         ) {
@@ -36,10 +35,13 @@ class ButtonBuilder : AbstractButtonBuilder<DrawContext, ButtonWidget>() {
                 listeners.init(this)
             }
 
-            override fun renderWidget(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-                listeners.render(this, context, mouseX, mouseY, delta)
-
-                super.renderWidget(context, mouseX, mouseY, delta)
+            override fun drawIcon(
+                context: DrawContext?,
+                mouseX: Int,
+                mouseY: Int,
+                deltaTicks: Float
+            ) {
+                // Empty
             }
 
             override fun mouseClicked(click: Click, doubled: Boolean): Boolean {

progreso-client/src/main/kotlin/org/progreso/client/util/render/Render3D.kt

@@ -12,7 +12,7 @@ import java.awt.Color
 data class Render3DContext(val matrices: MatrixStack, val camera: Camera? = null)
 
 fun render3D(matrices: MatrixStack, block: Render3DContext.() -> Unit) {
-    val camera = mc.client.entityRenderDispatcher.camera ?: return
+    val camera = mc.client.gameRenderer.camera ?: return
 
     matrices.push()
     block(Render3DContext(matrices, camera))
@@ -31,7 +31,7 @@ fun Render3DContext.withPosition(pos: BlockPos, block: Render3DContext.() -> Uni
 }
 
 fun Render3DContext.withRelativeToCameraPosition(pos: Vec3d, block: Render3DContext.() -> Unit) {
-    val relativePos = pos.subtract(camera!!.pos)
+    val relativePos = pos.subtract(camera!!.cameraPos)
 
     matrices.push()
     matrices.translate(relativePos.x, relativePos.y, relativePos.z)
@@ -43,7 +43,7 @@ fun Render3DContext.withRelativeToCameraPosition(pos: BlockPos, block: Render3DC
     withRelativeToCameraPosition(Vec3d(pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble()), block)
 }
 
-fun Render3DContext.drawOutlinedBox(box: Box, color: Color) {
+fun Render3DContext.drawOutlinedBox(box: Box, color: Color, lineWidth: Float = 2.0F) {
     val (red, green, blue, alpha) = color.glColors
     val matrix = matrices.peek().positionMatrix
     val layer = RenderLayers.getLines(false)
@@ -91,13 +91,16 @@ fun Render3DContext.drawOutlinedBox(box: Box, color: Color) {
             vec3d.x.toFloat(),
             vec3d.y.toFloat(),
             vec3d.z.toFloat()
-        ).color(red, green, blue, alpha).normal(normal.x.toFloat(), normal.y.toFloat(), normal.z.toFloat())
+        )
+            .lineWidth(lineWidth)
+            .color(red, green, blue, alpha)
+            .normal(normal.x.toFloat(), normal.y.toFloat(), normal.z.toFloat())
     }
 
     vertexConsumerProvider.draw(layer)
 }
 
-fun Render3DContext.drawSolidBox(box: Box, color: Color) {
+fun Render3DContext.drawSolidBox(box: Box, color: Color, lineWidth: Float = 2.0F) {
     val (red, green, blue, alpha) = color.glColors
     val matrix = matrices.peek().positionMatrix
     val layer = RenderLayers.getQuads(false)
@@ -136,7 +139,9 @@ fun Render3DContext.drawSolidBox(box: Box, color: Color) {
             vec3d.x.toFloat(),
             vec3d.y.toFloat(),
             vec3d.z.toFloat()
-        ).color(red, green, blue, alpha)
+        )
+            .lineWidth(lineWidth)
+            .color(red, green, blue, alpha)
     }
 
     vertexConsumerProvider.draw(layer)

progreso-client/src/main/kotlin/org/progreso/client/util/render/Render3DLayers.kt

@@ -1,47 +1,42 @@
 package org.progreso.client.util.render
 
 import net.minecraft.client.gl.RenderPipelines
-import net.minecraft.client.render.RenderLayer
-import net.minecraft.client.render.RenderPhase.LineWidth
-import net.minecraft.client.render.VertexConsumerProvider
+import net.minecraft.client.render.*
 import org.progreso.client.Client.Companion.mc
-import java.util.*
 
 val vertexConsumerProvider: VertexConsumerProvider.Immediate = mc.bufferBuilders.entityVertexConsumers
 
 object RenderLayers {
-    private val LINES: RenderLayer.MultiPhase = RenderLayer.of(
-        "progreso:lines_3d", 1536, RenderPipelines.LINES,
-        RenderLayer.MultiPhaseParameters.builder()
-            .lineWidth(LineWidth(OptionalDouble.of(2.0)))
-            .layering(RenderLayer.VIEW_OFFSET_Z_LAYERING)
-            .target(RenderLayer.ITEM_ENTITY_TARGET).build(false)
+    private val LINES: RenderLayer = RenderLayer.of(
+        "progreso:lines_3d",
+        RenderSetup
+            .builder(RenderPipelines.LINES)
+            .layeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+            .outputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+            .build()
     )
 
-    private val ESP_LINES: RenderLayer.MultiPhase = RenderLayer.of(
-        "progreso:esp_lines_3d", 1536, Render3DShaderPipelines.ESP_LINES,
-        RenderLayer.MultiPhaseParameters.builder()
-            .lineWidth(LineWidth(OptionalDouble.of(2.0)))
-            .layering(RenderLayer.VIEW_OFFSET_Z_LAYERING)
-            .target(RenderLayer.ITEM_ENTITY_TARGET).build(false)
+    private val ESP_LINES: RenderLayer = RenderLayer.of(
+        "progreso:esp_lines_3d",
+        RenderSetup
+            .builder(Render3DShaderPipelines.ESP_LINES)
+            .layeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+            .outputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+            .build()
     )
 
-    private val QUADS: RenderLayer.MultiPhase = RenderLayer.of(
+    private val QUADS: RenderLayer = RenderLayer.of(
         "progreso:quads_3d",
-        1536,
-        false,
-        true,
-        Render3DShaderPipelines.QUADS,
-        RenderLayer.MultiPhaseParameters.builder().build(false)
+        RenderSetup
+            .builder(Render3DShaderPipelines.QUADS)
+            .build()
     )
 
-    private val ESP_QUADS: RenderLayer.MultiPhase = RenderLayer.of(
+    private val ESP_QUADS: RenderLayer = RenderLayer.of(
         "progreso:esp_quads_3d",
-        1536,
-        false,
-        true,
-        Render3DShaderPipelines.ESP_QUADS,
-        RenderLayer.MultiPhaseParameters.builder().build(false)
+        RenderSetup
+            .builder(Render3DShaderPipelines.ESP_QUADS)
+            .build()
     )
 
     /**

progreso-client/src/main/kotlin/org/progreso/client/util/render/Render3DShaderPipelines.kt

@@ -3,26 +3,27 @@ package org.progreso.client.util.render
 import com.mojang.blaze3d.pipeline.RenderPipeline
 import com.mojang.blaze3d.platform.DepthTestFunction
 import net.minecraft.client.gl.RenderPipelines
+import net.minecraft.util.Identifier
 
 object Render3DShaderPipelines {
     val ESP_LINES: RenderPipeline = RenderPipelines.register(
         RenderPipeline.builder(RenderPipelines.RENDERTYPE_LINES_SNIPPET)
-            .withLocation("pipeline/progreso_esp_lines_3d")
+            .withLocation(Identifier.of("progreso", "pipeline/3d/esp_lines"))
             .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build()
     )
 
     val QUADS: RenderPipeline = RenderPipelines
         .register(
             RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
-                .withLocation("pipeline/progreso_quads_3d")
+                .withLocation(Identifier.of("progreso", "pipeline/3d/quads"))
                 .withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
                 .build()
         )
 
     val ESP_QUADS: RenderPipeline = RenderPipelines
         .register(
             RenderPipeline.builder(RenderPipelines.POSITION_COLOR_SNIPPET)
-                .withLocation("pipeline/progreso_esp_quads_3d")
+                .withLocation(Identifier.of("progreso", "pipeline/3d/esp_quads"))
                 .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build()
         )
 }

progreso-client/src/main/resources/progreso.accesswidener

@@ -12,4 +12,6 @@ mutable field net/minecraft/util/ApiServices sessionService Lcom/mojang/authlib/
 
 accessible field net/minecraft/client/gui/widget/EntryListWidget children Ljava/util/List;
 
-accessible method net/minecraft/client/gui/screen/Screen addDrawableChild (Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;
+accessible method net/minecraft/client/gui/screen/Screen addDrawableChild (Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;
+
+accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;Lnet/minecraft/client/render/RenderSetup;)Lnet/minecraft/client/render/RenderLayer;