Updated Fabric to 1.21.10, reworked ProgresoPluginsScreen

Author: ya-ilya

gradle.properties

@@ -5,18 +5,18 @@ org.gradle.caching=true
 
 # kotlin
 kotlin.code.style=official
-kotlinVersion=2.0.20
+kotlinVersion=2.2.20
 
 # progreso
 progresoVersion=0.3.1
 
 # fabric
 fabric.loom.multiProjectOptimisation=true
-minecraftVersion=1.21.8
-fabricVersion=0.131.0+1.21.8
+minecraftVersion=1.21.10
+fabricVersion=0.135.0+1.21.10
 fabricLoomVersion=1.11-SNAPSHOT
-yarnMappings=1.21.8+build.1
-loaderVersion=0.16.14
+yarnMappings=1.21.10+build.2
+loaderVersion=0.17.3
 
 # other
 gsonVersion=2.11.0

progreso-api/src/main/kotlin/org/progreso/api/gui/builders/AbstractElementListBuilder.kt

@@ -7,14 +7,11 @@ abstract class AbstractElementListBuilder<Context, ElementListWidget, Entry>
     : AbstractWidgetBuilder<Context, ElementListWidget>() {
     protected val elementListListeners = ElementListListeners<Context, ElementListWidget, Entry>()
 
-    var headerHeight = 16
-
     var itemWidth = 0
     var itemHeight = 32
 
-    var renderHeader = false
-
     protected var children = mutableListOf<Entry>()
+    protected var childrenInitializers = mutableListOf<ElementListWidget.() -> Entry>()
 
     fun listDimension(x: Int, y: Int, width: Int, height: Int, itemHeight: Int) {
         this.x = x
@@ -29,9 +26,8 @@ abstract class AbstractElementListBuilder<Context, ElementListWidget, Entry>
         children.add(entry)
     }
 
-    fun renderHeader(block: ElementListWidget.(Context, Int, Int) -> Unit) {
-        renderHeader = true
-        elementListListeners.renderHeader = block
+    fun addEntry(entry: ElementListWidget.() -> Entry) {
+        childrenInitializers.add(entry)
     }
 
     fun select(block: ElementListWidget.(Entry?) -> Unit) {

progreso-api/src/main/kotlin/org/progreso/api/gui/data/ElementListListeners.kt

@@ -1,6 +1,5 @@
 package org.progreso.api.gui.data
 
 data class ElementListListeners<Context, Widget, Entry>(
-    var renderHeader: Widget.(Context, Int, Int) -> Unit = { _, _, _ -> },
     var select: Widget.(Entry?) -> Unit = { _ -> }
 )

progreso-client/build.gradle.kts

@@ -16,8 +16,8 @@ group = "org.progreso"
 version = progresoVersion
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_24
+    targetCompatibility = JavaVersion.VERSION_24
 }
 
 base {
@@ -89,7 +89,7 @@ tasks {
     }
 
     withType<JavaCompile>().configureEach {
-        options.release.set(21)
+        options.release.set(24)
     }
 
     shadowJar {

progreso-client/src/main/java/org/progreso/client/mixins/client/MixinKeyboard.java

@@ -1,6 +1,8 @@
 package org.progreso.client.mixins.client;
 
 import net.minecraft.client.Keyboard;
+import net.minecraft.client.input.CharInput;
+import net.minecraft.client.input.KeyInput;
 import org.progreso.client.Client;
 import org.progreso.client.events.input.CharEvent;
 import org.progreso.client.events.input.KeyEvent;
@@ -16,8 +18,8 @@ public abstract class MixinKeyboard {
         at = @At("HEAD"),
         cancellable = true
     )
-    public void onKeyHook(long window, int key, int scancode, int action, int modifiers, CallbackInfo callbackInfo) {
-        if (action >= 1 && Client.EVENT_BUS.post(new KeyEvent(key, scancode, action))) {
+    public void onKeyHook(long window, int action, KeyInput input, CallbackInfo callbackInfo) {
+        if (action >= 1 && Client.EVENT_BUS.post(new KeyEvent(input.key(), input.scancode(), action))) {
             callbackInfo.cancel();
         }
     }
@@ -27,8 +29,8 @@ public void onKeyHook(long window, int key, int scancode, int action, int modifi
         at = @At("HEAD"),
         cancellable = true
     )
-    public void onCharHook(long window, int codePoint, int modifiers, CallbackInfo callbackInfo) {
-        if (Client.EVENT_BUS.post(new CharEvent(codePoint))) {
+    public void onCharHook(long window, CharInput input, CallbackInfo callbackInfo) {
+        if (Client.EVENT_BUS.post(new CharEvent(input.codepoint()))) {
             callbackInfo.cancel();
         }
     }

progreso-client/src/main/java/org/progreso/client/mixins/client/MixinMouse.java

@@ -1,6 +1,7 @@
 package org.progreso.client.mixins.client;
 
 import net.minecraft.client.Mouse;
+import net.minecraft.client.input.MouseInput;
 import org.progreso.client.Client;
 import org.progreso.client.events.input.MouseEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,8 +16,8 @@ public abstract class MixinMouse {
         at = @At("HEAD"),
         cancellable = true
     )
-    public void onMouseButtonHook(long window, int button, int action, int mods, CallbackInfo callbackInfo) {
-        if (Client.EVENT_BUS.post(new MouseEvent(button, action))) {
+    public void onMouseButtonHook(long window, MouseInput input, int action, CallbackInfo callbackInfo) {
+        if (Client.EVENT_BUS.post(new MouseEvent(input.button(), action))) {
             callbackInfo.cancel();
         }
     }

progreso-client/src/main/java/org/progreso/client/mixins/gui/MixinScreen.java

@@ -3,13 +3,11 @@
 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 {

progreso-client/src/main/java/org/progreso/client/mixins/network/MixinClientPlayerEntity.java

@@ -24,7 +24,9 @@
 
 @Mixin(ClientPlayerEntity.class)
 public abstract class MixinClientPlayerEntity extends AbstractClientPlayerEntity {
-    @Shadow @Final protected MinecraftClient client;
+    @Shadow
+    @Final
+    protected MinecraftClient client;
 
     @Unique
     private Screen cachedScreen;
@@ -50,8 +52,7 @@ public void tickHook(CallbackInfo callbackInfo) {
             ordinal = 1
         )
     )
-    private void afterTickNausea(boolean fromPortalEffect, CallbackInfo ci)
-    {
+    private void afterTickNausea(boolean fromPortalEffect, CallbackInfo ci) {
         if (cachedScreen != null) {
             client.currentScreen = cachedScreen;
             cachedScreen = null;

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

@@ -7,7 +7,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.profiler.Profilers;
 import org.joml.Matrix4f;
-import org.objectweb.asm.Opcodes;
 import org.progreso.client.Client;
 import org.progreso.client.events.render.Render3DEvent;
 import org.progreso.client.modules.render.FullBright;
@@ -45,7 +44,7 @@ private static void getNightVisionStrengthHook(
     public void renderWorldHook(
         RenderTickCounter tickCounter,
         CallbackInfo callbackInfo,
-        @Local(ordinal = 2) Matrix4f matrix4f2,
+        @Local(ordinal = 1) Matrix4f matrix4f2,
         @Local(ordinal = 1) float tickDelta
     ) {
         Profilers.get().push("progreso_3d_render");

progreso-client/src/main/java/org/progreso/client/mixins/sound/MixinSoundSystem.java

@@ -7,7 +7,6 @@
 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(SoundSystem.class)