From 6b565f81432635b24d38930e2069f3e459e3cea2 Mon Sep 17 00:00:00 2001
From: ErrorCraft <errorcraftderp@gmail.com>
Date: Sun, 25 Oct 2026 00:17:59 +0200
Subject: [PATCH] Port to 26.4 snapshot 4

---
 gradle.properties                                         | 2 +-
 .../mixin/mojang/serialization/CodecExtender.java         | 6 +++++-
 .../mojang/serialization/codecs/BaseMapCodecExtender.java | 6 +++---
 .../serialization/codecs/DispatchedMapCodecExtender.java  | 2 +-
 .../serialization/codecs/KeyDispatchCodecExtender.java    | 2 +-
 .../errorcraft/codecium/serialization/FieldMapCodec.java  | 8 +++++++-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 266414a..15f91f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.3-snapshot-5
+minecraft_version=26.4-snapshot-4
 loader_version=0.19.3
 
 # Mod Properties
diff --git a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/CodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/CodecExtender.java
index 71723f8..74967a8 100644
--- a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/CodecExtender.java
+++ b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/CodecExtender.java
@@ -1,6 +1,10 @@
 package net.errorcraft.codecium.mixin.mojang.serialization;
 
-import com.mojang.serialization.*;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.MapDecoder;
+import com.mojang.serialization.MapEncoder;
 import net.errorcraft.codecium.serialization.FieldMapCodec;
 import net.errorcraft.codecium.util.EnglishUtil;
 import net.errorcraft.codecium.util.codec.NumberUtil;
diff --git a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/BaseMapCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/BaseMapCodecExtender.java
index edb6433..a542d93 100644
--- a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/BaseMapCodecExtender.java
+++ b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/BaseMapCodecExtender.java
@@ -24,7 +24,7 @@ public interface BaseMapCodecExtender<K, V> {
     Codec<K> keyCodec();
 
     @ModifyArg(
-        method = "lambda$decode$3",
+        method = "lambda$decode$0",
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
@@ -36,7 +36,7 @@ private <T> Supplier<String> duplicateFieldUseBetterErrorMessage(Supplier<String
     }
 
     @WrapOperation(
-        method = "lambda$decode$3",
+        method = "lambda$decode$0",
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
@@ -49,7 +49,7 @@ private <T> DataResult<K> addKeyToKeyErrorMessage(Codec<K> instance, final Dynam
     }
 
     @ModifyArg(
-        method = "lambda$decode$3",
+        method = "lambda$decode$0",
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/serialization/DataResult;apply2stable(Ljava/util/function/BiFunction;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult;",
diff --git a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/DispatchedMapCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/DispatchedMapCodecExtender.java
index 68803fb..d6bad66 100644
--- a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/DispatchedMapCodecExtender.java
+++ b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/DispatchedMapCodecExtender.java
@@ -46,7 +46,7 @@ private <T> DataResult<Unit> duplicateFieldUseBetterErrorMessage(DataResult<Unit
     }
 
     @ModifyArg(
-        method = "lambda$decode$5",
+        method = "lambda$decode$0",
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/serialization/DataResult;mapError(Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/DataResult;"
diff --git a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/KeyDispatchCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/KeyDispatchCodecExtender.java
index b3b2b28..6252b2d 100644
--- a/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/KeyDispatchCodecExtender.java
+++ b/src/main/java/net/errorcraft/codecium/mixin/mojang/serialization/codecs/KeyDispatchCodecExtender.java
@@ -18,7 +18,7 @@ public class KeyDispatchCodecExtender {
     private static String COMPRESSED_VALUE_KEY;
 
     @ModifyArg(
-        method = "lambda$decode$2",
+        method = "lambda$decode$1",
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
diff --git a/src/main/java/net/errorcraft/codecium/serialization/FieldMapCodec.java b/src/main/java/net/errorcraft/codecium/serialization/FieldMapCodec.java
index 5331e16..6dea1a1 100644
--- a/src/main/java/net/errorcraft/codecium/serialization/FieldMapCodec.java
+++ b/src/main/java/net/errorcraft/codecium/serialization/FieldMapCodec.java
@@ -1,6 +1,12 @@
 package net.errorcraft.codecium.serialization;
 
-import com.mojang.serialization.*;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.DynamicOps;
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.MapDecoder;
+import com.mojang.serialization.MapEncoder;
+import com.mojang.serialization.MapLike;
+import com.mojang.serialization.RecordBuilder;
 
 import java.util.function.Supplier;
 import java.util.stream.Stream;