Update to 1.21.6

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.9.2'
+	id 'fabric-loom' version '1.10.1'
 	id 'maven-publish'
 }
 
@@ -15,6 +15,7 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
 
 loom {

gradle.properties

@@ -4,11 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
-loader_version=0.16.10
+
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
+
+# Fabric API
+fabric_version=0.128.2+1.21.6
 
 # Mod Properties
-mod_version = 2.2.0
+mod_version = 2.2.3
 maven_group = de.steamwar
 archives_base_name = AdvancedScripts

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/de/steamwar/advancedscripts/AdvancedScripts.java

@@ -20,10 +20,12 @@
 package de.steamwar.advancedscripts;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 
 public class AdvancedScripts implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
+		PayloadTypeRegistry.playC2S().register(KeyAction.ID, KeyAction.CODEC);
 	}
 }

src/main/java/de/steamwar/advancedscripts/lexer/TokenTypeColors.java

@@ -33,9 +33,9 @@ public class TokenTypeColors {
 
     public static final int VARIABLE = 0xFFFFFFFF;
     public static final int COMMENT = 0xFF656565;
-    public static final int CONSTANT = 0x3F6EC6;
+    public static final int CONSTANT = 0xFF3F6EC6;
 
     public static final int NUMBER = 0xFF61839F;
     public static final int BOOLEAN = 0xFF925F35;
-    public static final int STRING = 0x6a8759;
+    public static final int STRING = 0xFF6a8759;
 }

src/main/java/de/steamwar/advancedscripts/mixin/KeyboardMixin.java

@@ -20,9 +20,9 @@
 package de.steamwar.advancedscripts.mixin;
 
 import de.steamwar.advancedscripts.KeyAction;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.Keyboard;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -34,7 +34,7 @@ public class KeyboardMixin {
     public void sendKeyPress(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
         MinecraftClient client = ((Keyboard) (Object)this).client;
         if(client.currentScreen == null && action != 2) {
-            client.getNetworkHandler().sendPacket(new CustomPayloadC2SPacket(new KeyAction(key, (byte) action, modifiers)));
+            ClientPlayNetworking.send(new KeyAction(key, (byte) action, modifiers));
         }
     }
 }

src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java

@@ -19,17 +19,17 @@
 
 package de.steamwar.advancedscripts.screen;
 
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import com.mojang.blaze3d.systems.RenderSystem;
-import de.steamwar.advancedscripts.lexer.TokenTypeColors;
 import de.steamwar.advancedscripts.lexer.ScriptColorizer;
 import de.steamwar.advancedscripts.lexer.Token;
+import de.steamwar.advancedscripts.lexer.TokenTypeColors;
 import net.minecraft.client.font.TextHandler;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.BookEditScreen;
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.PressableWidget;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.NarratorManager;
 import net.minecraft.client.util.SelectionManager;
 import net.minecraft.component.DataComponentTypes;
@@ -43,9 +43,11 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
 import org.apache.commons.lang3.mutable.MutableInt;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 public class ScriptEditScreen extends Screen {
 
@@ -158,8 +160,6 @@ public class ScriptEditScreen extends Screen {
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         setFocused(null);
-        this.renderBackground(context, mouseX, mouseY, delta);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
         context.fill(23, 23, this.width - 23, this.height - 63, TokenTypeColors.BACKGROUND);
 
         int lineNumberLength = textRenderer.getWidth(lines.size() + "");
@@ -189,7 +189,7 @@ public class ScriptEditScreen extends Screen {
             if (lineTooLong(s)) {
                 context.fill(25 + lineNumberLength + 2, 25 + lineNumber.getValue() * 9, 25 + lineNumberLength + 3, 25 + lineNumber.getValue() * 9 + height, TokenTypeColors.ERROR);
             }
-            context.drawText(textRenderer, String.valueOf(lineNumberText), (int) (25f + lineNumberLength - textRenderer.getWidth(String.valueOf(lineNumberText))), (int) (25f + lineNumber.getValue() * 9f), 0xFFFFFF, false);
+            context.drawText(textRenderer, String.valueOf(lineNumberText), (int) (25f + lineNumberLength - textRenderer.getWidth(String.valueOf(lineNumberText))), (int) (25f + lineNumber.getValue() * 9f), 0xFFFFFFFF, false);
             lineNumberText++;
 
             // Line text
@@ -629,7 +629,7 @@ public class ScriptEditScreen extends Screen {
     private void finalizeBook() {
         List<String> pages = toPages();
         this.writeNbtData(pages);
-        int i = this.hand == Hand.MAIN_HAND ? this.player.getInventory().selectedSlot : 40;
+        int i = this.hand == Hand.MAIN_HAND ? this.player.getInventory().getSelectedSlot() : 40;
         this.client.getNetworkHandler().sendPacket(new BookUpdateC2SPacket(i, pages, Optional.empty()));
     }
 

src/main/resources/fabric.mod.json

@@ -23,7 +23,8 @@
   "depends": {
     "fabricloader": ">=0.14.11",
     "minecraft": ">=1.20.6",
-    "java": ">=21"
+    "java": ">=21",
+    "fabric-api": "*"
   },
   "accessWidener" : "advancedscripts.accesswidener"
 }