From f670f4dd5dbf5c4b9a4128c79b8be26ece63e089 Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Thu, 12 May 2022 08:21:27 +0800 Subject: [PATCH] fix(utils): fix EffectUtils getEffect function --- .../java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java | 2 +- .../java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java index 20953cd4..a7569e8f 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java @@ -44,7 +44,7 @@ static Optional getEffect(String id) { @Nonnull static MobEffect getEffectOrElseThrow(ResourceLocation id) { - return Optional.ofNullable(ForgeRegistries.MOB_EFFECTS.getValue(id)).orElseThrow(RegistryEntryException.UNKNOWN_MOB_EFFECT.create(id.toString())); + return getEffect(id).orElseThrow(RegistryEntryException.UNKNOWN_MOB_EFFECT.create(id.toString())); } @Nonnull diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java index da9fb6a4..77e3fbef 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java @@ -8,11 +8,11 @@ import net.minecraftforge.registries.ForgeRegistries; public interface EnchUtils { + static Enchantment getEnchantment(String id) { return ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(id)); } - static void enchantOne(ListTag enchantments, int index, int level) { CompoundTag nbt = enchantments.getCompound(index); nbt.putShort("lvl", (short) (nbt.getShort("lvl") + level));