From 1c8d6d698600813d8e8b09b109ecb26a2ae6a01f Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 29 Dec 2015 12:32:06 -0800 Subject: [PATCH] Allow rituals to specify an update time. Default is 20 --- .../java/WayofTime/bloodmagic/api/ritual/Ritual.java | 4 ++++ .../java/WayofTime/bloodmagic/ritual/RitualWater.java | 11 +++++++---- .../bloodmagic/tile/TileMasterRitualStone.java | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java index 1b2cb6de..5ff6f39a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java @@ -35,6 +35,10 @@ public abstract class Ritual { public abstract int getRefreshCost(); + public int getRefreshTime() { + return 20; + } + public abstract ArrayList getComponents(); public void addOffsetRunes(ArrayList components, int offset1, int offset2, int y, EnumRuneType rune) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index 05948507..55e7efff 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -12,7 +12,7 @@ import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.ritual.RitualComponent; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -public class RitualWater extends Ritual{ +public class RitualWater extends Ritual { public RitualWater() { super("ritualWater", 0, 1000); @@ -20,14 +20,12 @@ public class RitualWater extends Ritual{ @Override public void performRitual(IMasterRitualStone masterRitualStone) { - System.out.println("Performing Effect"); World world = masterRitualStone.getWorld(); SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world); int currentEssence = network.getCurrentEssence(); - if(currentEssence < getRefreshCost()) { + if(currentEssence < getRefreshCost()) return; - } BlockPos pos = masterRitualStone.getPos().up(); if(world.isAirBlock(pos)) { @@ -36,6 +34,11 @@ public class RitualWater extends Ritual{ } } + @Override + public int getRefreshTime() { + return 1; + } + @Override public int getRefreshCost() { return 50; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 3859c931..c313e9ad 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; @NoArgsConstructor public class TileMasterRitualStone extends TileEntity implements IMasterRitualStone, ITickable { - public static final int REFRESH_TIME = 20; + public static final int UPDATE_TIME = 20; private String owner; private boolean active; @@ -44,7 +44,7 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt @Override public void update() { if (getCurrentRitual() != null && isActive()) { - if (activeTime % REFRESH_TIME == 0) + if (activeTime % getCurrentRitual().getRefreshTime() == 0) performRitual(getWorld(), getPos()); activeTime++;