MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Ingredient Codec

Browse source
This commit is contained in:
Frank 2023-12-19 18:08:07 +01:00
parent 4f01267940
commit 5cdfa335e0
1 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/org/betterx/bclib/util/ItemUtil.java
View file

@ -16,9 +16,11 @@ import net.minecraft.world.item.crafting.Ingredient;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.function.Function;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class ItemUtil { public class ItemUtil {
@Nullable @Nullable
public static ItemStack fromStackString(String stackString) { public static ItemStack fromStackString(String stackString) {
if (stackString == null || stackString.isEmpty()) { if (stackString == null || stackString.isEmpty()) {
@ -47,19 +49,45 @@ public class ItemUtil {
return null; return null;
} }
public static Codec<ItemStack> CODEC_ITEM_STACK_WITH_NBT = RecordCodecBuilder.create((instance) -> instance.group( // public static Codec<ItemStack> CODEC_ITEM_STACK_WITH_NBT = RecordCodecBuilder.create((instance) -> instance.group(
BuiltInRegistries.ITEM.holderByNameCodec() // BuiltInRegistries.ITEM.holderByNameCodec()
.fieldOf("item") // .fieldOf("item")
.forGetter(ItemStack::getItemHolder), // .forGetter(ItemStack::getItemHolder),
Codec.INT.optionalFieldOf("count", 1) // Codec.INT.optionalFieldOf("count", 1)
.forGetter(ItemStack::getCount), // .forGetter(ItemStack::getCount),
ExtraCodecs.strictOptionalField(TagParser.AS_CODEC, "nbt") // ExtraCodecs.strictOptionalField(TagParser.AS_CODEC, "nbt")
.forGetter((itemStack) -> Optional.ofNullable(itemStack.getTag())) // .forGetter((itemStack) -> Optional.ofNullable(itemStack.getTag()))
).apply(instance, ItemStack::new)); // ).apply(instance, ItemStack::new));
private static final Codec<Ingredient.ItemValue> CODEC_NBT_ITEM_VALUE = RecordCodecBuilder.create((instance) -> instance public static <T> Codec<T> codecItemStackWithNBT(
.group(CODEC_ITEM_STACK_WITH_NBT.fieldOf("item").forGetter((itemValue) -> itemValue.item())) Function<T, ItemStack> getter,
.apply(instance, Ingredient.ItemValue::new)); Function<ItemStack, T> factory
) {
return RecordCodecBuilder.create((instance) -> instance.group(
BuiltInRegistries.ITEM.holderByNameCodec()
.fieldOf("item")
.forGetter(o -> getter.apply(o).getItemHolder()),
Codec.INT.optionalFieldOf("count", 1)
.forGetter(o -> getter.apply(o).getCount()),
ExtraCodecs.strictOptionalField(TagParser.AS_CODEC, "nbt")
.forGetter(o -> Optional.ofNullable(getter.apply(o).getTag()))
).apply(instance, (item, count, nbt) -> factory.apply(new ItemStack(item, count, nbt))));
}
public static Codec<ItemStack> CODEC_ITEM_STACK_WITH_NBT = codecItemStackWithNBT(
Function.identity(),
Function.identity()
);
public static Codec<Ingredient.ItemValue> CODEC_NBT_ITEM_VALUE = codecItemStackWithNBT(
(itemValue) -> itemValue.item(),
(stack) -> new Ingredient.ItemValue(stack)
);
// private static final Codec<Ingredient.ItemValue> CODEC_NBT_ITEM_VALUE = RecordCodecBuilder.create((instance) -> instance
// .group(CODEC_ITEM_STACK_WITH_NBT.fieldOf("item").forGetter((itemValue) -> itemValue.item()))
// .apply(instance, Ingredient.ItemValue::new));
private static final Codec<Ingredient.Value> VALUE_CODEC = ExtraCodecs private static final Codec<Ingredient.Value> VALUE_CODEC = ExtraCodecs
.xor(CODEC_NBT_ITEM_VALUE, Ingredient.TagValue.CODEC) .xor(CODEC_NBT_ITEM_VALUE, Ingredient.TagValue.CODEC)