diff --git a/src/main/java/net/minecraftforge/common/loot/LootModifierManager.java b/src/main/java/net/minecraftforge/common/loot/LootModifierManager.java index c3300ae3fe..d928ddc696 100644 --- a/src/main/java/net/minecraftforge/common/loot/LootModifierManager.java +++ b/src/main/java/net/minecraftforge/common/loot/LootModifierManager.java @@ -75,21 +75,12 @@ public class LootModifierManager extends SimpleJsonResourceReloadListener { //use layered config to fetch modifier data files (modifiers missing from config are disabled) for (ResourceLocation location : finalLocations) { - Codec codec = ForgeRegistries.GLOBAL_LOOT_MODIFIER_SERIALIZERS.get().getValue(location); - if (codec == null) - { - LOGGER.warn("Unknown or unregistered codec for GlobalLootModifier: {}", location); - continue; - } JsonElement json = resourceList.get(location); - IGlobalLootModifier modifier = codec.decode(JsonOps.INSTANCE, json).get() - .map(Pair::getFirst, partial -> - { - LOGGER.warn("Could not decode GlobalLootModifier with serializer: {} - error: {}", location, partial.message()); - return null; - }); - if(modifier != null) - builder.put(location, modifier); + IGlobalLootModifier.DIRECT_CODEC.parse(JsonOps.INSTANCE, json) + // log error if parse fails + .resultOrPartial(errorMsg -> LOGGER.warn("Could not decode GlobalLootModifier with json id {} - error: {}", location, errorMsg)) + // add loot modifier if parse succeeds + .ifPresent(modifier -> builder.put(location, modifier)); } this.registeredLootModifiers = builder.build(); }