From 5eabf5b0091e198fcfb993757c69a1e7b814367e Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 2 Jan 2016 14:31:56 -0800 Subject: [PATCH] Remove Test ritual and disable ImperfectRitualDay --- .../bloodmagic/registry/ModRituals.java | 19 ++---- .../bloodmagic/ritual/RitualTest.java | 68 ------------------- 2 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 3a60b2e1..1739ac6b 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -9,7 +9,6 @@ import WayofTime.bloodmagic.ritual.imperfect.*; public class ModRituals { - public static Ritual testRitual; public static Ritual waterRitual; public static Ritual lavaRitual; public static Ritual greenGroveRitual; @@ -18,7 +17,6 @@ public class ModRituals public static Ritual featheredKnifeRitual; public static Ritual regenerationRitual; - public static ImperfectRitual imperfectDay; public static ImperfectRitual imperfectNight; public static ImperfectRitual imperfectRain; public static ImperfectRitual imperfectResistance; @@ -26,29 +24,24 @@ public class ModRituals public static void initRituals() { - testRitual = new RitualTest(); waterRitual = new RitualWater(); - lavaRitual = new RitualLava(); - greenGroveRitual = new RitualGreenGrove(); - jumpRitual = new RitualJumping(); - sufferingRitual = new RitualWellOfSuffering(); - featheredKnifeRitual = new RitualFeatheredKnife(); - regenerationRitual = new RitualRegeneration(); - - RitualRegistry.registerRitual(testRitual, testRitual.getName()); RitualRegistry.registerRitual(waterRitual, waterRitual.getName()); + lavaRitual = new RitualLava(); RitualRegistry.registerRitual(lavaRitual, lavaRitual.getName()); + greenGroveRitual = new RitualGreenGrove(); RitualRegistry.registerRitual(greenGroveRitual, greenGroveRitual.getName()); + jumpRitual = new RitualJumping(); RitualRegistry.registerRitual(jumpRitual, jumpRitual.getName()); + sufferingRitual = new RitualWellOfSuffering(); RitualRegistry.registerRitual(sufferingRitual, sufferingRitual.getName()); + featheredKnifeRitual = new RitualFeatheredKnife(); RitualRegistry.registerRitual(featheredKnifeRitual, featheredKnifeRitual.getName()); + regenerationRitual = new RitualRegeneration(); RitualRegistry.registerRitual(regenerationRitual, regenerationRitual.getName()); } public static void initImperfectRituals() { - imperfectDay = new ImperfectRitualDay(); - ImperfectRitualRegistry.registerRitual(imperfectDay); imperfectNight = new ImperfectRitualNight(); ImperfectRitualRegistry.registerRitual(imperfectNight); imperfectRain = new ImperfectRitualRain(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java deleted file mode 100644 index 4f41b0bf..00000000 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package WayofTime.bloodmagic.ritual; - -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; - -import java.util.ArrayList; - -public class RitualTest extends Ritual -{ - public RitualTest() - { - super("ritualTest", 0, 1000, "ritual." + Constants.Mod.MODID + ".testRitual"); - } - - @Override - public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player) - { - player.addChatComponentMessage(new ChatComponentText("ritual started")); - return true; - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - EntityPlayer player = PlayerHelper.getPlayerFromUUID(masterRitualStone.getOwner()); - - if (player != null) - player.addChatComponentMessage(new ChatComponentText("effect performed")); - } - - @Override - public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) - { - EntityPlayer player = PlayerHelper.getPlayerFromUUID(masterRitualStone.getOwner()); - - if (player != null) - player.addChatComponentMessage(new ChatComponentText("ritual stopped - " + breakType.name())); - } - - @Override - public int getRefreshCost() - { - return 0; - } - - @Override - public ArrayList getComponents() - { - ArrayList components = new ArrayList(); - - components.add(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.AIR)); - components.add(new RitualComponent(new BlockPos(-1, 0, 1), EnumRuneType.EARTH)); - components.add(new RitualComponent(new BlockPos(1, 0, -1), EnumRuneType.WATER)); - components.add(new RitualComponent(new BlockPos(-1, 0, -1), EnumRuneType.FIRE)); - - return components; - } - - @Override - public Ritual getNewCopy() - { - return new RitualTest(); - } -}