lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Test ritual and disable ImperfectRitualDay

Browse source
This commit is contained in:
Nick 2016-01-02 14:31:56 -08:00
parent 1330b1608c
commit 5eabf5b009
2 changed files with 6 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/WayofTime/bloodmagic/registry/ModRituals.java
View file

@ -9,7 +9,6 @@ import WayofTime.bloodmagic.ritual.imperfect.*;
public class ModRituals public class ModRituals
{ {
public static Ritual testRitual;
public static Ritual waterRitual; public static Ritual waterRitual;
public static Ritual lavaRitual; public static Ritual lavaRitual;
public static Ritual greenGroveRitual; public static Ritual greenGroveRitual;
@ -18,7 +17,6 @@ public class ModRituals
public static Ritual featheredKnifeRitual; public static Ritual featheredKnifeRitual;
public static Ritual regenerationRitual; public static Ritual regenerationRitual;
public static ImperfectRitual imperfectDay;
public static ImperfectRitual imperfectNight; public static ImperfectRitual imperfectNight;
public static ImperfectRitual imperfectRain; public static ImperfectRitual imperfectRain;
public static ImperfectRitual imperfectResistance; public static ImperfectRitual imperfectResistance;
@ -26,29 +24,24 @@ public class ModRituals
public static void initRituals() public static void initRituals()
{ {
testRitual = new RitualTest();
waterRitual = new RitualWater(); 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()); RitualRegistry.registerRitual(waterRitual, waterRitual.getName());
lavaRitual = new RitualLava();
RitualRegistry.registerRitual(lavaRitual, lavaRitual.getName()); RitualRegistry.registerRitual(lavaRitual, lavaRitual.getName());
greenGroveRitual = new RitualGreenGrove();
RitualRegistry.registerRitual(greenGroveRitual, greenGroveRitual.getName()); RitualRegistry.registerRitual(greenGroveRitual, greenGroveRitual.getName());
jumpRitual = new RitualJumping();
RitualRegistry.registerRitual(jumpRitual, jumpRitual.getName()); RitualRegistry.registerRitual(jumpRitual, jumpRitual.getName());
sufferingRitual = new RitualWellOfSuffering();
RitualRegistry.registerRitual(sufferingRitual, sufferingRitual.getName()); RitualRegistry.registerRitual(sufferingRitual, sufferingRitual.getName());
featheredKnifeRitual = new RitualFeatheredKnife();
RitualRegistry.registerRitual(featheredKnifeRitual, featheredKnifeRitual.getName()); RitualRegistry.registerRitual(featheredKnifeRitual, featheredKnifeRitual.getName());
regenerationRitual = new RitualRegeneration();
RitualRegistry.registerRitual(regenerationRitual, regenerationRitual.getName()); RitualRegistry.registerRitual(regenerationRitual, regenerationRitual.getName());
} }
public static void initImperfectRituals() public static void initImperfectRituals()
{ {
imperfectDay = new ImperfectRitualDay();
ImperfectRitualRegistry.registerRitual(imperfectDay);
imperfectNight = new ImperfectRitualNight(); imperfectNight = new ImperfectRitualNight();
ImperfectRitualRegistry.registerRitual(imperfectNight); ImperfectRitualRegistry.registerRitual(imperfectNight);
imperfectRain = new ImperfectRitualRain(); imperfectRain = new ImperfectRitualRain();

68
src/main/java/WayofTime/bloodmagic/ritual/RitualTest.java
View file

@ -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<RitualComponent> getComponents()
{
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
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();
}
}