diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index b2e90887f..7cecad867 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -11,25 +11,30 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Effect; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.registries.IForgeRegistry; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.brew.potion.*; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; +import static vazkii.botania.common.block.ModBlocks.register; + public class ModPotions { - public static final Effect soulCross = new PotionSoulCross().setRegistryName(LibMisc.MOD_ID, LibPotionNames.SOUL_CROSS); - public static final Effect featherfeet = new PotionFeatherfeet().setRegistryName(LibMisc.MOD_ID, LibPotionNames.FEATHER_FEET); - public static final Effect emptiness = new PotionEmptiness().setRegistryName(LibMisc.MOD_ID, LibPotionNames.EMPTINESS); - public static final Effect bloodthrst = new PotionBloodthirst().setRegistryName(LibMisc.MOD_ID, LibPotionNames.BLOODTHIRST); - public static final Effect allure = new PotionAllure().setRegistryName(LibMisc.MOD_ID, LibPotionNames.ALLURE); - public static final Effect clear = new PotionClear().setRegistryName(LibMisc.MOD_ID, LibPotionNames.CLEAR); + public static final Effect soulCross = new PotionSoulCross(); + public static final Effect featherfeet = new PotionFeatherfeet(); + public static final Effect emptiness = new PotionEmptiness(); + public static final Effect bloodthrst = new PotionBloodthirst(); + public static final Effect allure = new PotionAllure(); + public static final Effect clear = new PotionClear(); public static void registerPotions(RegistryEvent.Register evt) { - evt.getRegistry().register(soulCross); - evt.getRegistry().register(featherfeet); - evt.getRegistry().register(emptiness); - evt.getRegistry().register(bloodthrst); - evt.getRegistry().register(allure); - evt.getRegistry().register(clear); + IForgeRegistry r = evt.getRegistry(); + register(r, LibPotionNames.SOUL_CROSS, soulCross); + register(r, LibPotionNames.FEATHER_FEET, soulCross); + register(r, LibPotionNames.EMPTINESS, soulCross); + register(r, LibPotionNames.BLOODTHIRST, soulCross); + register(r, LibPotionNames.ALLURE, soulCross); + register(r, LibPotionNames.CLEAR, soulCross); } } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index f1846fbf5..2dfc9270f 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -14,20 +14,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectType; +import net.minecraft.potion.InstantEffect; import javax.annotation.Nonnull; -public class PotionClear extends Effect { +public class PotionClear extends InstantEffect { public PotionClear() { super(EffectType.NEUTRAL, 0xFFFFFF); } - @Override - public boolean isInstant() { - return true; - } - @Override public void affectEntity(Entity e, Entity e1, @Nonnull LivingEntity e2, int t, double d) { e2.curePotionEffects(new ItemStack(Items.MILK_BUCKET));