From 1b05b8b2bcf5fc77074eff5464ca4e7778c1f85c Mon Sep 17 00:00:00 2001 From: ErrorCraft Date: Thu, 23 Jul 2026 00:03:46 +0200 Subject: [PATCH] Port to 26.3 snapshot 5 --- gradle.properties | 2 +- .../registries/codec}/HolderSetCodecExtender.java | 10 +++++----- .../registries/codec}/RegistryFileCodecExtender.java | 6 +++--- .../registries/codec}/RegistryFixedCodecExtender.java | 9 ++++----- src/main/resources/codecium.mixins.json | 6 +++--- 5 files changed, 16 insertions(+), 17 deletions(-) rename src/main/java/net/errorcraft/codecium/mixin/minecraft/{resources => core/registries/codec}/HolderSetCodecExtender.java (85%) rename src/main/java/net/errorcraft/codecium/mixin/minecraft/{resources => core/registries/codec}/RegistryFileCodecExtender.java (93%) rename src/main/java/net/errorcraft/codecium/mixin/minecraft/{resources => core/registries/codec}/RegistryFixedCodecExtender.java (87%) diff --git a/gradle.properties b/gradle.properties index 893b9d6..6d61155 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-4 +minecraft_version=26.3-snapshot-5 loader_version=0.19.3 # Mod Properties diff --git a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/HolderSetCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/HolderSetCodecExtender.java similarity index 85% rename from src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/HolderSetCodecExtender.java rename to src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/HolderSetCodecExtender.java index 7ee5aed..a2b05af 100644 --- a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/HolderSetCodecExtender.java +++ b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/HolderSetCodecExtender.java @@ -1,9 +1,9 @@ -package net.errorcraft.codecium.mixin.minecraft.resources; +package net.errorcraft.codecium.mixin.minecraft.core.registries.codec; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.core.HolderSet; import net.minecraft.core.Registry; -import net.minecraft.resources.HolderSetCodec; +import net.minecraft.core.registries.codec.HolderSetCodec; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.TagKey; import org.spongepowered.asm.mixin.Final; @@ -39,7 +39,7 @@ private Supplier decodeInaccessibleRegistryUseBetterErrorMessage(Supplie ) ) private static Supplier unknownRegistryTagUseBetterErrorMessage(Supplier message, @Local(argsOnly = true, name = "key") TagKey key) { - return () -> "Cannot get a registry tag with id " + key.location(); + return () -> "Cannot get a tag with id " + key.location() + " from registry " + key.registry().identifier(); } @ModifyArg( @@ -50,8 +50,8 @@ private static Supplier unknownRegistryTagUseBetterErrorMessage(Supp ordinal = 0 ) ) - private Supplier invalidOwnerUseBetterErrorMessage(Supplier message, @Local(argsOnly = true, name = "input") HolderSet input) { - return () -> "Registry tag " + input.unwrapKey().orElseThrow().location() + " is not part of the current registry set"; + private Supplier invalidOwnerUseBetterErrorMessage(Supplier message, @Local(name = "named") HolderSet.Named named) { + return () -> "Tag " + named.key().location() + " is not part of the current registry set"; } @ModifyArg( diff --git a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFileCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFileCodecExtender.java similarity index 93% rename from src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFileCodecExtender.java rename to src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFileCodecExtender.java index 5f5d35e..57f2dd3 100644 --- a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFileCodecExtender.java +++ b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFileCodecExtender.java @@ -1,9 +1,9 @@ -package net.errorcraft.codecium.mixin.minecraft.resources; +package net.errorcraft.codecium.mixin.minecraft.core.registries.codec; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.core.Holder; import net.minecraft.core.Registry; -import net.minecraft.resources.RegistryFileCodec; +import net.minecraft.core.registries.codec.RegistryFileCodec; import net.minecraft.resources.ResourceKey; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -62,6 +62,6 @@ private Supplier inlinedHoldersDisallowedUseBetterErrorMessage(Supplier< ) ) private static Supplier unknownHolderUseBetterErrorMessage(Supplier message, @Local(argsOnly = true, name = "elementKey") ResourceKey elementKey) { - return () -> "Cannot get a holder with id " + elementKey.identifier(); + return () -> "Cannot get a holder with id " + elementKey.identifier() + " from registry " + elementKey.registry(); } } diff --git a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFixedCodecExtender.java b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFixedCodecExtender.java similarity index 87% rename from src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFixedCodecExtender.java rename to src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFixedCodecExtender.java index 9e0d1c2..2ff42ab 100644 --- a/src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/RegistryFixedCodecExtender.java +++ b/src/main/java/net/errorcraft/codecium/mixin/minecraft/core/registries/codec/RegistryFixedCodecExtender.java @@ -1,10 +1,9 @@ -package net.errorcraft.codecium.mixin.minecraft.resources; +package net.errorcraft.codecium.mixin.minecraft.core.registries.codec; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.core.Holder; import net.minecraft.core.Registry; -import net.minecraft.resources.Identifier; -import net.minecraft.resources.RegistryFixedCodec; +import net.minecraft.core.registries.codec.RegistryFixedCodec; import net.minecraft.resources.ResourceKey; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -73,7 +72,7 @@ private Supplier decodeInaccessibleRegistryUseBetterErrorMessage(Supplie target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;" ) ) - private static Supplier unknownHolderUseBetterErrorMessage(Supplier message, @Local(argsOnly = true, name = "id") Identifier id) { - return () -> "Cannot get a holder with id " + id; + private static Supplier unknownHolderUseBetterErrorMessage(Supplier message, @Local(argsOnly = true, name = "elementKey") ResourceKey elementKey) { + return () -> "Cannot get a holder with id " + elementKey.identifier() + " from registry " + elementKey.registry(); } } diff --git a/src/main/resources/codecium.mixins.json b/src/main/resources/codecium.mixins.json index e1bae8f..ef12656 100644 --- a/src/main/resources/codecium.mixins.json +++ b/src/main/resources/codecium.mixins.json @@ -8,12 +8,12 @@ "minecraft.commands.arguments.item.ItemParserExtender$StateExtender", "minecraft.commands.arguments.item.ItemPredicateArgumentExtender$ComponentWrapperExtender", "minecraft.commands.arguments.item.ItemPredicateArgumentExtender$PredicateWrapperExtender", + "minecraft.core.registries.codec.HolderSetCodecExtender", + "minecraft.core.registries.codec.RegistryFileCodecExtender", + "minecraft.core.registries.codec.RegistryFixedCodecExtender", "minecraft.nbt.NbtOpsExtender", "minecraft.nbt.NbtOpsExtender$MapLikeExtender", - "minecraft.resources.HolderSetCodecExtender", "minecraft.resources.IdentifierExtender", - "minecraft.resources.RegistryFileCodecExtender", - "minecraft.resources.RegistryFixedCodecExtender", "minecraft.util.ExtraCodecsExtender", "mojang.serialization.CodecExtender", "mojang.serialization.DataResultExtender",