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

Rituals now react to redstone

Browse source
This commit is contained in:
Nick 2016-01-28 14:54:32 -08:00
parent 5b05a175bb
commit a408f9a959
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -11,6 +11,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.api.util.helper.RitualHelper; import WayofTime.bloodmagic.api.util.helper.RitualHelper;
import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.item.ItemActivationCrystal;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.ChatUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import lombok.Getter; import lombok.Getter;
@ -34,10 +35,9 @@ import net.minecraftforge.fml.common.eventhandler.Event;
@NoArgsConstructor @NoArgsConstructor
public class TileMasterRitualStone extends TileEntity implements IMasterRitualStone, ITickable public class TileMasterRitualStone extends TileEntity implements IMasterRitualStone, ITickable
{ {
public static final int UPDATE_TIME = 20;
private String owner; private String owner;
private boolean active; private boolean active;
private boolean redstoned;
private int activeTime; private int activeTime;
private int cooldown; private int cooldown;
private Ritual currentRitual; private Ritual currentRitual;
@ -47,6 +47,26 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
@Override @Override
public void update() public void update()
{ {
if (worldObj.isRemote)
return;
if (getWorld().isBlockPowered(getPos()) && isActive())
{
active = false;
redstoned = true;
stopRitual(Ritual.BreakType.REDSTONE);
return;
}
if (!isActive() && !getWorld().isBlockPowered(getPos()) && isRedstoned() && getCurrentRitual() != null)
{
active = true;
redstoned = false;
ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(ModItems.activationCrystal, 1, getCurrentRitual().getCrystalLevel()));
crystalStack.getTagCompound().setString(Constants.NBT.OWNER_UUID, getOwner());
activateRitual(crystalStack, PlayerHelper.getPlayerFromUUID(getOwner()), getCurrentRitual());
}
if (getCurrentRitual() != null && isActive()) if (getCurrentRitual() != null && isActive())
{ {
if (activeTime % getCurrentRitual().getRefreshTime() == 0) if (activeTime % getCurrentRitual().getRefreshTime() == 0)
@ -184,9 +204,12 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt
return; return;
getCurrentRitual().stopRitual(this, breakType); getCurrentRitual().stopRitual(this, breakType);
this.currentRitual = null; if (breakType != Ritual.BreakType.REDSTONE)
this.active = false; {
this.activeTime = 0; this.currentRitual = null;
this.active = false;
this.activeTime = 0;
}
} }
} }