diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 94dd8e15..ab854ecf 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -3,10 +3,12 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualNight; +import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRain; public class ModRituals { public static ImperfectRitual imperfectNight; + public static ImperfectRitual imperfectRain; public static void initRituals() { @@ -14,6 +16,8 @@ public class ModRituals { public static void initImperfectRituals() { imperfectNight = new ImperfectRitualNight(); - ImperfectRitualRegistry.registerRitual(imperfectNight, imperfectNight.getName()); + ImperfectRitualRegistry.registerRitual(imperfectNight); + imperfectRain = new ImperfectRitualRain(); + ImperfectRitualRegistry.registerRitual(imperfectRain); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index 7a302926..d638dc5c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -19,7 +19,7 @@ public class ImperfectRitualNight extends ImperfectRitual { boolean retFlag = false; if (!imperfectRitualStone.getWorld().isRemote) { -// imperfectRitualStone.getWorld().addWeatherEffect(new EntityLightningBolt(imperfectRitualStone.getWorld(), imperfectRitualStone.getPos().getX(), imperfectRitualStone.getPos().getY() + 2, imperfectRitualStone.getPos().getZ())); + imperfectRitualStone.getWorld().addWeatherEffect(new EntityLightningBolt(imperfectRitualStone.getWorld(), imperfectRitualStone.getPos().getX(), imperfectRitualStone.getPos().getY() + 2, imperfectRitualStone.getPos().getZ())); imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000 + 13800); retFlag = true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java new file mode 100644 index 00000000..33289eaa --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -0,0 +1,33 @@ +package WayofTime.bloodmagic.ritual.imperfect; + +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; + +public class ImperfectRitualRain extends ImperfectRitual { + + public ImperfectRitualRain() { + super("rain", new BlockStack(Blocks.water), 5000, true); + } + + @Override + public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { + boolean retFlag = false; + + if (!imperfectRitualStone.getWorld().isRemote) { + imperfectRitualStone.getWorld().addWeatherEffect(new EntityLightningBolt(imperfectRitualStone.getWorld(), imperfectRitualStone.getPos().getX(), imperfectRitualStone.getPos().getY() + 2, imperfectRitualStone.getPos().getZ())); + imperfectRitualStone.getWorld().getWorldInfo().setRaining(true); + retFlag = true; + } + + if (imperfectRitualStone.getWorld().isRemote) { + imperfectRitualStone.getWorld().setRainStrength(1.0F); + imperfectRitualStone.getWorld().setThunderStrength(1.0F); + } + + return retFlag; + } +}