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

More recipe cleanups

Browse source
This commit is contained in:
Frank 2023-12-19 19:02:18 +01:00
parent 3c76941ab7
commit e27b6eb469
2 changed files with 3 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/betterx/bclib/recipes/AlloyingRecipe.java
View file

@ -227,7 +227,9 @@ public class AlloyingRecipe implements Recipe<Container>, UnknownReceipBookCateg
.fieldOf("ingredients") .fieldOf("ingredients")
.forGetter(recipe -> List.of(recipe.primaryInput, recipe.secondaryInput)), .forGetter(recipe -> List.of(recipe.primaryInput, recipe.secondaryInput)),
ExtraCodecs.strictOptionalField(Codec.STRING, "group") ExtraCodecs.strictOptionalField(Codec.STRING, "group")
.forGetter(recipe -> Optional.ofNullable(recipe.group)), .forGetter(recipe -> recipe.group == null || recipe.group.isEmpty()
? Optional.empty()
: Optional.ofNullable(recipe.group)),
ItemUtil.CODEC_ITEM_STACK_WITH_NBT.fieldOf("result").forGetter(recipe -> recipe.output), ItemUtil.CODEC_ITEM_STACK_WITH_NBT.fieldOf("result").forGetter(recipe -> recipe.output),
Codec.FLOAT.optionalFieldOf("experience", 0f).forGetter(recipe -> recipe.experience), Codec.FLOAT.optionalFieldOf("experience", 0f).forGetter(recipe -> recipe.experience),
Codec.INT.optionalFieldOf("smelttime", 350).forGetter(recipe -> recipe.smeltTime) Codec.INT.optionalFieldOf("smelttime", 350).forGetter(recipe -> recipe.smeltTime)

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

@ -1,54 +1,20 @@
package org.betterx.bclib.util; package org.betterx.bclib.util;
import org.betterx.bclib.BCLib;
import com.mojang.datafixers.util.Either; import com.mojang.datafixers.util.Either;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.TagParser; import net.minecraft.nbt.TagParser;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.ExtraCodecs; import net.minecraft.util.ExtraCodecs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient; 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 java.util.function.Function;
import org.jetbrains.annotations.Nullable;
public class ItemUtil { public class ItemUtil {
@Nullable
public static ItemStack fromStackString(String stackString) {
if (stackString == null || stackString.isEmpty()) {
return null;
}
try {
String[] parts = stackString.split(":");
if (parts.length < 2) return null;
if (parts.length == 2) {
ResourceLocation itemId = new ResourceLocation(stackString);
Item item = BuiltInRegistries
.ITEM
.getOptional(itemId)
.orElseThrow(() -> new IllegalStateException("Output item " + itemId + " does not exists!"));
return new ItemStack(item);
}
ResourceLocation itemId = new ResourceLocation(parts[0], parts[1]);
Item item = BuiltInRegistries
.ITEM
.getOptional(itemId)
.orElseThrow(() -> new IllegalStateException("Output item " + itemId + " does not exists!"));
return new ItemStack(item, Integer.parseInt(parts[2]));
} catch (Exception ex) {
BCLib.LOGGER.error("ItemStack deserialization error!", ex);
}
return null;
}
public static <T> Codec<T> codecItemStackWithNBT( public static <T> Codec<T> codecItemStackWithNBT(
Function<T, ItemStack> getter, Function<T, ItemStack> getter,
Function<ItemStack, T> factory Function<ItemStack, T> factory