Updated fabric to 1.21.4, kotlin to 2.0.20

ya-ilya · ya-ilya · commit 29863c0eed12 · 2024-12-27T00:24:57.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -5,17 +5,17 @@ org.gradle.caching=true
 
 # kotlin
 kotlin.code.style=official
-kotlinVersion=2.0.0
+kotlinVersion=2.0.20
 
 # progreso
 progresoVersion=0.3.1
 
 # fabric
-minecraftVersion=1.21
-fabricVersion=0.100.4+1.21
-fabricLoomVersion=1.6-SNAPSHOT
-yarnMappings=1.21+build.7
-loaderVersion=0.15.11
+minecraftVersion=1.21.4
+fabricVersion=0.113.0+1.21.4
+fabricLoomVersion=1.8-SNAPSHOT
+yarnMappings=1.21.4+build.2
+loaderVersion=0.16.9
 
 # other
 gsonVersion=2.11.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/progreso-api/src/main/kotlin/org/progreso/api/accessor/ChatAccessor.kt b/progreso-api/src/main/kotlin/org/progreso/api/accessor/ChatAccessor.kt
@@ -32,7 +32,7 @@ import org.progreso.api.Api
  */
 interface ChatAccessor {
     open class Default : ChatAccessor {
-        override fun send(message: Any) {}
+        override fun send(message: Any, overlay: Boolean) {}
         override fun info(message: Any) {}
         override fun warn(message: Any) {}
         override fun error(message: Any) {}
@@ -42,8 +42,9 @@ interface ChatAccessor {
      * Send message to the chat
      *
      * @param message Message
+     * @param overlay Show message in overlay
      */
-    fun send(message: Any)
+    fun send(message: Any, overlay: Boolean = false)
 
     /**
      * Send localized message to the chat
diff --git a/progreso-client/src/main/java/org/progreso/client/mixins/gui/MixinInGameHud.java b/progreso-client/src/main/java/org/progreso/client/mixins/gui/MixinInGameHud.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.render.RenderTickCounter;
+import net.minecraft.util.profiler.Profilers;
 import org.progreso.client.Client;
 import org.progreso.client.events.render.Render2DEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -21,8 +22,8 @@ public void renderHook(
         RenderTickCounter tickCounter,
         CallbackInfo callbackInfo
     ) {
-        Client.getMc().getClient().getProfiler().push("progreso_2d_render");
+        Profilers.get().push("progreso_2d_render");
         Client.EVENT_BUS.post(new Render2DEvent(context));
-        Client.getMc().getClient().getProfiler().pop();
+        Profilers.get().pop();
     }
 }
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
@@ -4,6 +4,7 @@
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.profiler.Profilers;
 import org.joml.Matrix4f;
 import org.objectweb.asm.Opcodes;
 import org.progreso.client.Client;
@@ -30,10 +31,10 @@ public void renderWorldHook(
         @Local(ordinal = 1) Matrix4f matrix4f2,
         @Local(ordinal = 1) float tickDelta
     ) {
-        Client.getMc().getClient().getProfiler().push("progreso_3d_render");
+        Profilers.get().push("progreso_3d_render");
         MatrixStack matrixStack = new MatrixStack();
         matrixStack.multiplyPositionMatrix(matrix4f2);
         Client.EVENT_BUS.post(new Render3DEvent(matrixStack, tickDelta));
-        Client.getMc().getClient().getProfiler().pop();
+        Profilers.get().pop();
     }
 }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/accessors/ChatAccessor.kt b/progreso-client/src/main/kotlin/org/progreso/client/accessors/ChatAccessor.kt
@@ -6,8 +6,8 @@ import org.progreso.api.accessor.ChatAccessor
 import org.progreso.client.Client.Companion.mc
 
 object ChatAccessor : ChatAccessor {
-    override fun send(message: Any) {
-        mc.player.sendMessage(Text.of(message.toString()))
+    override fun send(message: Any, overlay: Boolean) {
+        mc.player.sendMessage(Text.of(message.toString()), overlay)
     }
 
     override fun info(message: Any) {
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/gui/builders/ElementListBuilder.kt b/progreso-client/src/main/kotlin/org/progreso/client/gui/builders/ElementListBuilder.kt
@@ -17,56 +17,110 @@ class ElementListBuilder<E : ElementListWidget.Entry<E>>
     }
 
     override fun build(): ElementListWidget<E> {
-        return object : ElementListWidget<E>(mc.client, width, height, y, itemHeight) {
-            init {
-                x = this@ElementListBuilder.x
-                children().addAll(this@ElementListBuilder.children)
-                setRenderHeader(this@ElementListBuilder.renderHeader, this@ElementListBuilder.headerHeight)
-                listeners.init(this)
-            }
+        return if (renderHeader) {
+            object :
+                ElementListWidget<E>(mc.client, width, height, y, itemHeight, this@ElementListBuilder.headerHeight) {
+                init {
+                    x = this@ElementListBuilder.x
+                    children().addAll(this@ElementListBuilder.children)
+                    listeners.init(this)
+                }
 
-            override fun getRowWidth(): Int {
-                return this@ElementListBuilder.itemWidth
-            }
+                override fun getRowWidth(): Int {
+                    return this@ElementListBuilder.itemWidth
+                }
 
-            override fun getScrollbarX(): Int {
-                return x + width - 6
-            }
+                override fun getScrollbarX(): Int {
+                    return x + width - 6
+                }
 
-            override fun isSelectedEntry(index: Int): Boolean {
-                return index == children().indexOf(selectedOrNull ?: return false)
-            }
+                override fun isSelectedEntry(index: Int): Boolean {
+                    return index == children().indexOf(selectedOrNull ?: return false)
+                }
 
-            override fun setSelected(entry: E?) {
-                if (entry == null) return
-                super.setSelected(entry)
+                override fun setSelected(entry: E?) {
+                    if (entry == null) return
+                    super.setSelected(entry)
 
-                elementListListeners.select(this, entry)
-            }
+                    elementListListeners.select(this, entry)
+                }
 
-            override fun renderHeader(context: DrawContext, x: Int, y: Int) {
-                elementListListeners.renderHeader(this, context, x, y)
+                override fun renderHeader(context: DrawContext, x: Int, y: Int) {
+                    elementListListeners.renderHeader(this, context, x, y)
 
-                super.renderHeader(context, x, y)
-            }
+                    super.renderHeader(context, x, y)
+                }
 
-            override fun renderWidget(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-                listeners.render(this, context, mouseX, mouseY, delta)
+                override fun renderWidget(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
+                    listeners.render(this, context, mouseX, mouseY, delta)
 
-                super.renderWidget(context, mouseX, mouseY, delta)
-            }
+                    super.renderWidget(context, mouseX, mouseY, delta)
+                }
+
+                override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+                    setSelected(getEntryAtPosition(mouseX, mouseY))
+                    listeners.mouseClicked(this, mouseX.toInt(), mouseY.toInt(), button)
 
-            override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-                setSelected(getEntryAtPosition(mouseX, mouseY))
-                listeners.mouseClicked(this, mouseX.toInt(), mouseY.toInt(), button)
+                    return super.mouseClicked(mouseX, mouseY, button)
+                }
 
-                return super.mouseClicked(mouseX, mouseY, button)
+                override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
+                    listeners.mouseReleased(this, mouseX.toInt(), mouseY.toInt(), button)
+
+                    return super.mouseReleased(mouseX, mouseY, button)
+                }
             }
+        } else {
+            object : ElementListWidget<E>(mc.client, width, height, y, itemHeight) {
+                init {
+                    x = this@ElementListBuilder.x
+                    children().addAll(this@ElementListBuilder.children)
+                    listeners.init(this)
+                }
+
+                override fun getRowWidth(): Int {
+                    return this@ElementListBuilder.itemWidth
+                }
+
+                override fun getScrollbarX(): Int {
+                    return x + width - 6
+                }
+
+                override fun isSelectedEntry(index: Int): Boolean {
+                    return index == children().indexOf(selectedOrNull ?: return false)
+                }
+
+                override fun setSelected(entry: E?) {
+                    if (entry == null) return
+                    super.setSelected(entry)
+
+                    elementListListeners.select(this, entry)
+                }
+
+                override fun renderHeader(context: DrawContext, x: Int, y: Int) {
+                    elementListListeners.renderHeader(this, context, x, y)
+
+                    super.renderHeader(context, x, y)
+                }
+
+                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 mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+                    setSelected(getEntryAtPosition(mouseX, mouseY))
+                    listeners.mouseClicked(this, mouseX.toInt(), mouseY.toInt(), button)
+
+                    return super.mouseClicked(mouseX, mouseY, button)
+                }
 
-            override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
-                listeners.mouseReleased(this, mouseX.toInt(), mouseY.toInt(), button)
+                override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
+                    listeners.mouseReleased(this, mouseX.toInt(), mouseY.toInt(), button)
 
-                return super.mouseReleased(mouseX, mouseY, button)
+                    return super.mouseReleased(mouseX, mouseY, button)
+                }
             }
         }
     }
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
@@ -2,8 +2,12 @@ package org.progreso.client.gui.clickgui.element.elements
 
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
+import net.minecraft.client.gl.ShaderProgramKeys
 import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.render.*
+import net.minecraft.client.render.BufferRenderer
+import net.minecraft.client.render.Tessellator
+import net.minecraft.client.render.VertexFormat
+import net.minecraft.client.render.VertexFormats
 import org.progreso.api.setting.settings.ColorSetting
 import org.progreso.api.setting.settings.NumberSetting
 import org.progreso.client.gui.clickgui.element.AbstractChildElement
@@ -117,7 +121,7 @@ class ColorElement(
 
                 context.matrices.push()
 
-                RenderSystem.setShader(GameRenderer::getPositionColorProgram)
+                RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR)
 
                 var buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR)
 
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/gui/minecraft/ProgresoPluginsScreen.kt b/progreso-client/src/main/kotlin/org/progreso/client/gui/minecraft/ProgresoPluginsScreen.kt
@@ -50,7 +50,7 @@ class ProgresoPluginsScreen(private val plugins: Set<AbstractPlugin>) : TitledSc
                 if (selectedPlugin != lastSelected) {
                     lastSelected = selectedPlugin
                     children().clear()
-                    scrollAmount = -Double.MAX_VALUE
+                    scrollY = -Double.MAX_VALUE
                     if (lastSelected != null) {
                         children().add(
                             InfoEntry(
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/modules/combat/Criticals.kt b/progreso-client/src/main/kotlin/org/progreso/client/modules/combat/Criticals.kt
@@ -22,10 +22,10 @@ object Criticals : AbstractModule() {
             val y = mc.player.y
             val z = mc.player.z
 
-            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.05, z, false))
-            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false))
-            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.012, z, false))
-            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false))
+            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.05, z, false, false))
+            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false, false))
+            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.012, z, false, false))
+            mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false, false))
         }
     }
 }
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/modules/misc/AutoTool.kt b/progreso-client/src/main/kotlin/org/progreso/client/modules/misc/AutoTool.kt
@@ -31,7 +31,9 @@ object AutoTool : AbstractModule() {
 
         if (speed > 1.0f) {
             speed += EnchantmentHelper.getLevel(
-                mc.world.registryManager.get(RegistryKeys.ENCHANTMENT).getEntry(Enchantments.EFFICIENCY).get(),
+                mc.world.registryManager
+                    .getOrThrow(RegistryKeys.ENCHANTMENT)
+                    .getOrThrow(Enchantments.EFFICIENCY),
                 stack
             )
         }
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
@@ -3,8 +3,12 @@ package org.progreso.client.util.render
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
 import net.minecraft.client.font.*
+import net.minecraft.client.gl.ShaderProgramKeys
 import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.render.*
+import net.minecraft.client.render.BufferRenderer
+import net.minecraft.client.render.Tessellator
+import net.minecraft.client.render.VertexFormat
+import net.minecraft.client.render.VertexFormats
 import net.minecraft.resource.ResourceManager
 import net.minecraft.util.Identifier
 import org.progreso.client.Client
@@ -54,7 +58,7 @@ fun Render2DContext.drawCircle(
 
     val angleStep = Math.toRadians(angleTo - angleFrom) / segments
 
-    RenderSystem.setShader { GameRenderer.getPositionProgram() }
+    RenderSystem.setShader(ShaderProgramKeys.POSITION)
 
     val buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION)
     buffer.vertex(matrix, centerX.toFloat(), centerY.toFloat(), 0f)
diff --git a/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render3D.kt b/progreso-client/src/main/kotlin/org/progreso/client/util/render/Render3D.kt
@@ -2,7 +2,11 @@ package org.progreso.client.util.render
 
 import com.mojang.blaze3d.platform.GlStateManager
 import com.mojang.blaze3d.systems.RenderSystem
-import net.minecraft.client.render.*
+import net.minecraft.client.gl.ShaderProgramKeys
+import net.minecraft.client.render.BufferRenderer
+import net.minecraft.client.render.Tessellator
+import net.minecraft.client.render.VertexFormat
+import net.minecraft.client.render.VertexFormats
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
@@ -56,7 +60,7 @@ fun Render3DContext.withColor(color: Color, block: Render3DContext.() -> Unit) {
 }
 
 fun Render3DContext.drawOutlinedBox(box: Box) {
-    RenderSystem.setShader(GameRenderer::getPositionProgram)
+    RenderSystem.setShader(ShaderProgramKeys.POSITION)
 
     val matrix = matrices.peek().positionMatrix
     val buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION)
@@ -101,7 +105,7 @@ fun Render3DContext.drawOutlinedBox(box: Box) {
 }
 
 fun Render3DContext.drawSolidBox(box: Box) {
-    RenderSystem.setShader(GameRenderer::getPositionProgram)
+    RenderSystem.setShader(ShaderProgramKeys.POSITION)
 
     val matrix = matrices.peek().positionMatrix
     val buffer = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION)

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import org.progreso.api.accessor.ChatAccessor`
`6`	`6`	`import org.progreso.client.Client.Companion.mc`
`7`	`7`
`8`	`8`	`object ChatAccessor : ChatAccessor {`
`9`		`- override fun send(message: Any) {`
`10`		`- mc.player.sendMessage(Text.of(message.toString()))`
	`9`	`+ override fun send(message: Any, overlay: Boolean) {`
	`10`	`+ mc.player.sendMessage(Text.of(message.toString()), overlay)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`override fun info(message: Any) {`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ object Criticals : AbstractModule() {`
`22`	`22`	`val y = mc.player.y`
`23`	`23`	`val z = mc.player.z`
`24`	`24`
`25`		`- mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.05, z, false))`
`26`		`- mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false))`
`27`		`- mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.012, z, false))`
`28`		`- mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false))`
	`25`	`+ mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.05, z, false, false))`
	`26`	`+ mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false, false))`
	`27`	`+ mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y + 0.012, z, false, false))`
	`28`	`+ mc.networkHandler.sendPacket(PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, false, false))`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`