feat(utils): EffectUtils makeIncurable method

Co-authored-by: WakelessSloth56 <wsloth56@foxmail.com>
auioc · Jun 20, 2022 · 1f68242 · 1f68242
1 parent cdadf54
commit 1f68242
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/game/alchemy/HPotion.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/alchemy/HPotion.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
+import org.auioc.mcmod.arnicalib.utils.game.EffectUtils;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.Item;
@@ -40,7 +41,7 @@ public HPotion(String name, MobEffect effect, int duration, int amplifier, boole
         this(name, () -> {
             var instance = new MobEffectInstance(effect, duration, amplifier);
             if (incurable) {
-                instance.setCurativeItems(new ArrayList<ItemStack>());
+                EffectUtils.makeIncurable(instance);
             }
             return new MobEffectInstance[] {instance};
         });

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
@@ -7,13 +7,13 @@
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
 import org.auioc.mcmod.arnicalib.api.game.registry.RegistryEntryException;
 import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinMobEffectInstance;
 import org.auioc.mcmod.arnicalib.utils.java.RandomUtils;
 import org.auioc.mcmod.arnicalib.utils.java.Validate;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -190,4 +190,9 @@ static int getEffectLevel(LivingEntity entity, MobEffect effect) {
         return instance.getAmplifier() + 1;
     }
 
+    static MobEffectInstance makeIncurable(MobEffectInstance instance) {
+        instance.setCurativeItems(new ArrayList<ItemStack>());
+        return instance;
+    }
+
 }