Changed formatting to have bracing on a new line

This commit is contained in:
WayofTime 2015-12-30 15:34:40 -05:00
parent e5eddd6c45
commit e48eedb874
189 changed files with 6092 additions and 4041 deletions

View file

@ -17,74 +17,88 @@ import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
public class RitualGreenGrove extends Ritual {
public class RitualGreenGrove extends Ritual
{
public static final String GROW_RANGE = "growing";
public RitualGreenGrove() {
super("ritualGreenGrove", 0, 1000, "ritual." + Constants.Mod.MODID + ".greenGroveRitual");
addBlockRange(GROW_RANGE, new BlockPos[] { new BlockPos(-1, 2, -1), new BlockPos(1, 2, 1) });
}
public static final String GROW_RANGE = "growing";
@Override
public void performRitual(IMasterRitualStone masterRitualStone) {
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
public RitualGreenGrove()
{
super("ritualGreenGrove", 0, 1000, "ritual." + Constants.Mod.MODID + ".greenGroveRitual");
addBlockRange(GROW_RANGE, new BlockPos[] { new BlockPos(-1, 2, -1), new BlockPos(1, 2, 1) });
}
if (currentEssence < getRefreshCost())
return;
int maxGrowths = currentEssence / getRefreshCost();
int totalGrowths = 0;
@Override
public void performRitual(IMasterRitualStone masterRitualStone)
{
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
BlockPos[] growingRange = getBlockRange(GROW_RANGE);
if (currentEssence < getRefreshCost())
return;
for (int i = growingRange[0].getX(); i <= growingRange[1].getX(); i++) {
for (int j = growingRange[0].getY(); j <= growingRange[1].getY(); j++) {
for (int k = growingRange[0].getZ(); k <= growingRange[1].getZ(); k++) {
BlockPos newPos = masterRitualStone.getPos().add(i, j, k);
IBlockState state = world.getBlockState(newPos);
Block block = state.getBlock();
if (block instanceof IPlantable || block instanceof IGrowable) {
block.updateTick(world, newPos, state, new Random());
totalGrowths++;
}
if (totalGrowths >= maxGrowths) {
break;
}
}
if (totalGrowths >= maxGrowths) {
break;
}
}
if (totalGrowths >= maxGrowths) {
break;
}
}
network.syphon(totalGrowths * getRefreshCost());
}
int maxGrowths = currentEssence / getRefreshCost();
int totalGrowths = 0;
@Override
public int getRefreshTime() {
return 20;
}
BlockPos[] growingRange = getBlockRange(GROW_RANGE);
@Override
public int getRefreshCost() {
return 20;
}
for (int i = growingRange[0].getX(); i <= growingRange[1].getX(); i++)
{
for (int j = growingRange[0].getY(); j <= growingRange[1].getY(); j++)
{
for (int k = growingRange[0].getZ(); k <= growingRange[1].getZ(); k++)
{
BlockPos newPos = masterRitualStone.getPos().add(i, j, k);
IBlockState state = world.getBlockState(newPos);
Block block = state.getBlock();
if (block instanceof IPlantable || block instanceof IGrowable)
{
block.updateTick(world, newPos, state, new Random());
totalGrowths++;
}
@Override
public ArrayList<RitualComponent> getComponents() {
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
if (totalGrowths >= maxGrowths)
{
break;
}
}
this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH);
this.addParallelRunes(components, 1, 0, EnumRuneType.WATER);
if (totalGrowths >= maxGrowths)
{
break;
}
}
return components;
}
if (totalGrowths >= maxGrowths)
{
break;
}
}
network.syphon(totalGrowths * getRefreshCost());
}
@Override
public int getRefreshTime()
{
return 20;
}
@Override
public int getRefreshCost()
{
return 20;
}
@Override
public ArrayList<RitualComponent> getComponents()
{
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
this.addCornerRunes(components, 1, 0, EnumRuneType.EARTH);
this.addParallelRunes(components, 1, 0, EnumRuneType.WATER);
return components;
}
}

View file

@ -13,44 +13,51 @@ import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
public class RitualLava extends Ritual {
public class RitualLava extends Ritual
{
public RitualLava() {
super("ritualLava", 0, 10000, "ritual." + Constants.Mod.MODID + ".lavaRitual");
}
public RitualLava()
{
super("ritualLava", 0, 10000, "ritual." + Constants.Mod.MODID + ".lavaRitual");
}
@Override
public void performRitual(IMasterRitualStone masterRitualStone) {
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
if(currentEssence < getRefreshCost())
return;
BlockPos pos = masterRitualStone.getPos().up();
if(world.isAirBlock(pos)) {
world.setBlockState(pos, Blocks.lava.getDefaultState());
network.syphon(getRefreshCost());
}
}
@Override
public void performRitual(IMasterRitualStone masterRitualStone)
{
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
@Override
public int getRefreshTime() {
return 1;
}
if (currentEssence < getRefreshCost())
return;
@Override
public int getRefreshCost() {
return 500;
}
BlockPos pos = masterRitualStone.getPos().up();
if (world.isAirBlock(pos))
{
world.setBlockState(pos, Blocks.lava.getDefaultState());
network.syphon(getRefreshCost());
}
}
@Override
public ArrayList<RitualComponent> getComponents() {
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
@Override
public int getRefreshTime()
{
return 1;
}
@Override
public int getRefreshCost()
{
return 500;
}
@Override
public ArrayList<RitualComponent> getComponents()
{
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
this.addParallelRunes(components, 1, 0, EnumRuneType.FIRE);
return components;
}
}
}

View file

@ -9,20 +9,24 @@ import net.minecraft.util.ChatComponentText;
import java.util.ArrayList;
public class RitualTest extends Ritual {
public class RitualTest extends Ritual
{
public RitualTest() {
public RitualTest()
{
super("ritualTest", 0, 1000, "ritual." + Constants.Mod.MODID + ".testRitual");
}
@Override
public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player) {
public boolean activateRitual(IMasterRitualStone masterRitualStone, EntityPlayer player)
{
player.addChatComponentMessage(new ChatComponentText("ritual started"));
return true;
}
@Override
public void performRitual(IMasterRitualStone masterRitualStone) {
public void performRitual(IMasterRitualStone masterRitualStone)
{
EntityPlayer player = PlayerHelper.getPlayerFromUUID(masterRitualStone.getOwner());
if (player != null)
@ -30,7 +34,8 @@ public class RitualTest extends Ritual {
}
@Override
public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) {
public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType)
{
EntityPlayer player = PlayerHelper.getPlayerFromUUID(masterRitualStone.getOwner());
if (player != null)
@ -38,12 +43,14 @@ public class RitualTest extends Ritual {
}
@Override
public int getRefreshCost() {
public int getRefreshCost()
{
return 0;
}
@Override
public ArrayList<RitualComponent> getComponents() {
public ArrayList<RitualComponent> getComponents()
{
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
components.add(new RitualComponent(new BlockPos(1, 0, 1), EnumRuneType.AIR));

View file

@ -13,44 +13,51 @@ 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, 500, "ritual." + Constants.Mod.MODID + ".waterRitual");
}
public RitualWater()
{
super("ritualWater", 0, 500, "ritual." + Constants.Mod.MODID + ".waterRitual");
}
@Override
public void performRitual(IMasterRitualStone masterRitualStone) {
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
if(currentEssence < getRefreshCost())
return;
BlockPos pos = masterRitualStone.getPos().up();
if(world.isAirBlock(pos)) {
world.setBlockState(pos, Blocks.water.getDefaultState());
network.syphon(getRefreshCost());
}
}
@Override
public void performRitual(IMasterRitualStone masterRitualStone)
{
World world = masterRitualStone.getWorld();
SoulNetwork network = NetworkHelper.getSoulNetwork(masterRitualStone.getOwner(), world);
int currentEssence = network.getCurrentEssence();
@Override
public int getRefreshTime() {
return 1;
}
if (currentEssence < getRefreshCost())
return;
@Override
public int getRefreshCost() {
return 25;
}
BlockPos pos = masterRitualStone.getPos().up();
if (world.isAirBlock(pos))
{
world.setBlockState(pos, Blocks.water.getDefaultState());
network.syphon(getRefreshCost());
}
}
@Override
public ArrayList<RitualComponent> getComponents() {
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
@Override
public int getRefreshTime()
{
return 1;
}
@Override
public int getRefreshCost()
{
return 25;
}
@Override
public ArrayList<RitualComponent> getComponents()
{
ArrayList<RitualComponent> components = new ArrayList<RitualComponent>();
this.addCornerRunes(components, 1, 0, EnumRuneType.WATER);
return components;
}
}
}

View file

@ -6,14 +6,17 @@ import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
public class ImperfectRitualDay extends ImperfectRitual {
public class ImperfectRitualDay extends ImperfectRitual
{
public ImperfectRitualDay() {
public ImperfectRitualDay()
{
super("day", new BlockStack(Blocks.gold_block), 5000, true);
}
@Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) {
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{
if (!imperfectRitualStone.getWorld().isRemote)
imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000);

View file

@ -6,14 +6,17 @@ import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
public class ImperfectRitualNight extends ImperfectRitual {
public class ImperfectRitualNight extends ImperfectRitual
{
public ImperfectRitualNight() {
public ImperfectRitualNight()
{
super("night", new BlockStack(Blocks.lapis_block), 100, true);
}
@Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) {
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{
if (!imperfectRitualStone.getWorld().isRemote)
imperfectRitualStone.getWorld().setWorldTime((imperfectRitualStone.getWorld().getWorldTime() / 24000) * 24000 + 13800);

View file

@ -6,19 +6,24 @@ import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
public class ImperfectRitualRain extends ImperfectRitual {
public class ImperfectRitualRain extends ImperfectRitual
{
public ImperfectRitualRain() {
public ImperfectRitualRain()
{
super("rain", new BlockStack(Blocks.water), 5000, true);
}
@Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) {
if (!imperfectRitualStone.getWorld().isRemote) {
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{
if (!imperfectRitualStone.getWorld().isRemote)
{
imperfectRitualStone.getWorld().getWorldInfo().setRaining(true);
}
if (imperfectRitualStone.getWorld().isRemote) {
if (imperfectRitualStone.getWorld().isRemote)
{
imperfectRitualStone.getWorld().setRainStrength(1.0F);
imperfectRitualStone.getWorld().setThunderStrength(1.0F);
}

View file

@ -8,14 +8,17 @@ import net.minecraft.init.Blocks;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
public class ImperfectRitualResistance extends ImperfectRitual {
public class ImperfectRitualResistance extends ImperfectRitual
{
public ImperfectRitualResistance() {
public ImperfectRitualResistance()
{
super("resistance", new BlockStack(Blocks.bedrock), 5000);
}
@Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) {
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{
player.addPotionEffect(new PotionEffect(Potion.resistance.id, 1200, 1));

View file

@ -9,14 +9,17 @@ import net.minecraft.init.Blocks;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
public class ImperfectRitualZombie extends ImperfectRitual {
public class ImperfectRitualZombie extends ImperfectRitual
{
public ImperfectRitualZombie() {
public ImperfectRitualZombie()
{
super("zombie", new BlockStack(Blocks.coal_block), 5000);
}
@Override
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) {
public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player)
{
EntityZombie zombie = new EntityZombie(imperfectRitualStone.getWorld());
zombie.setPosition(imperfectRitualStone.getPos().getX() + 0.5, imperfectRitualStone.getPos().getY() + 2.1, imperfectRitualStone.getPos().getZ() + 0.5);
zombie.addPotionEffect(new PotionEffect(Potion.fireResistance.getId(), 2000));