From 27ac16b5d29d484c61cefab3f1f7ad4584234102 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 6 Oct 2015 19:23:25 -0700 Subject: [PATCH] Allow disabling of Weak Rituals --- .../WayofTime/alchemicalWizardry/AlchemicalWizardry.java | 5 +++++ .../alchemicalWizardry/BloodMagicConfiguration.java | 5 +++++ .../common/block/ImperfectRitualStone.java | 9 ++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 0b41b2bb..60d77989 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -387,6 +387,11 @@ public class AlchemicalWizardry public static boolean ritualDisabledPhantomHands; public static boolean ritualDisabledSphereIsland; + public static boolean ritualWeakDisabledNight; + public static boolean ritualWeakDisabledResistance; + public static boolean ritualWeakDisabledThunderstorm; + public static boolean ritualWeakDisabledZombie; + public static boolean displayRitualAnimation; public static boolean potionDisableRegen; diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index b76359ff..1ecde717 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -145,6 +145,11 @@ public class BloodMagicConfiguration AlchemicalWizardry.ritualDisabledPhantomHands = config.get("Ritual Blacklist", "Orchestra of the Phantom Hands", false).getBoolean(false); AlchemicalWizardry.ritualDisabledSphereIsland = config.get("Ritual Blacklist", "Birth of the Bastion", false).getBoolean(false); + AlchemicalWizardry.ritualWeakDisabledNight = config.get("Ritual Blacklist.Weak", "Night", false).getBoolean(false); + AlchemicalWizardry.ritualWeakDisabledResistance = config.get("Ritual Blacklist.Weak", "Resistance", false).getBoolean(false); + AlchemicalWizardry.ritualWeakDisabledThunderstorm = config.get("Ritual Blacklist.Weak", "Thunderstorm", false).getBoolean(false); + AlchemicalWizardry.ritualWeakDisabledZombie = config.get("Ritual Blacklist.Weak", "Zombie", false).getBoolean(false); + AlchemicalWizardry.potionDisableRegen = config.get("Alchemy Potion Blacklist", "Regeneration", false).getBoolean(false); AlchemicalWizardry.potionDisableNightVision = config.get("Alchemy Potion Blacklist", "Night Vision", false).getBoolean(false); AlchemicalWizardry.potionDisableFireResistance = config.get("Alchemy Potion Blacklist", "Fire Resistance", false).getBoolean(false); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java index cde800fc..debfd013 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java @@ -44,7 +44,7 @@ public class ImperfectRitualStone extends Block { Block block = world.getBlock(x, y + 1, z); - if (block == Blocks.water) + if (block == Blocks.water && !AlchemicalWizardry.ritualWeakDisabledThunderstorm) { if (!player.capabilities.isCreativeMode && !world.isRemote) { @@ -67,8 +67,7 @@ public class ImperfectRitualStone extends Block world.getWorldInfo().setThunderTime(0); world.getWorldInfo().setThundering(true); return true; - } else if (block == Blocks.coal_block) - { + } else if (block == Blocks.coal_block && !AlchemicalWizardry.ritualWeakDisabledZombie) { if (!player.capabilities.isCreativeMode && !world.isRemote) { EnergyItems.drainPlayerNetwork(player, 5000); @@ -87,7 +86,7 @@ public class ImperfectRitualStone extends Block } return true; - } else if (block == Blocks.lapis_block) + } else if (block == Blocks.lapis_block && !AlchemicalWizardry.ritualWeakDisabledNight) { if (!player.capabilities.isCreativeMode && !world.isRemote) { @@ -99,7 +98,7 @@ public class ImperfectRitualStone extends Block world.addWeatherEffect(new EntityLightningBolt(world, x, y + 2, z)); world.setWorldTime((world.getWorldTime() / 24000) * 24000 + 13800); } - } else if (block == Blocks.bedrock) + } else if (block == Blocks.bedrock && !AlchemicalWizardry.ritualWeakDisabledResistance) { if (!player.capabilities.isCreativeMode && !world.isRemote) {