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

Normalized code formatting.

Browse source
This commit is contained in:
WayofTime 2016-03-16 18:41:06 -04:00
parent b1db7c5152
commit 134b11f177
122 changed files with 944 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

@ -77,7 +77,8 @@ public class BlockAltar extends BlockContainer implements IVariantProvider
return Math.min(15, level) % 16;
}
}
} else {
} else
{
int maxEssence = altar.getCapacity();
int currentEssence = altar.getCurrentBlood();
int level = currentEssence * 15 / maxEssence;
@ -157,7 +158,8 @@ public class BlockAltar extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
View file

@ -75,7 +75,8 @@ public class BlockBloodLight extends Block
if (rand.nextInt(3) != 0)
{
worldIn.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
if (playerSP.getHeldItem() != null && playerSP.getHeldItem().getItem() == ModItems.sigilBloodLight) {
if (playerSP.getHeldItem() != null && playerSP.getHeldItem().getItem() == ModItems.sigilBloodLight)
{
worldIn.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
worldIn.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
worldIn.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);

3
src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
View file

@ -34,7 +34,8 @@ public class BlockBloodRune extends BlockString implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
View file

@ -29,7 +29,8 @@ public class BlockBloodStoneBrick extends BlockString implements IVariantProvide
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
View file

@ -45,7 +45,8 @@ public class BlockBloodTank extends BlockContainer
}
@Override
public int getRenderType() {
public int getRenderType()
{
return 3;
}

3
src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
View file

@ -29,7 +29,8 @@ public class BlockCrystal extends BlockString implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
View file

@ -103,7 +103,8 @@ public class BlockDemonCrucible extends BlockContainer implements IVariantProvid
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

5
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
View file

@ -38,7 +38,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
{
return side == EnumFacing.UP;
}
@Override
public boolean isOpaqueCube()
{
@ -70,7 +70,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
View file

@ -61,7 +61,8 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
View file

@ -73,7 +73,8 @@ public class BlockIncenseAltar extends BlockContainer implements IVariantProvide
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockPath.java
View file

@ -63,7 +63,8 @@ public class BlockPath extends BlockString implements IIncensePath, IVariantProv
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
View file

@ -94,7 +94,8 @@ public class BlockPhantom extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -106,7 +106,8 @@ public class BlockRitualController extends BlockStringContainer implements IVari
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

@ -55,7 +55,8 @@ public class BlockRitualStone extends BlockString implements IRitualStone, IVari
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (int i = 0; i < names.length; i++)
ret.add(new ImmutablePair<Integer, String>(i, "type=" + names[i]));

3
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

@ -85,7 +85,8 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
View file

@ -82,7 +82,8 @@ public class BlockSpectral extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;

3
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
View file

@ -69,7 +69,8 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider
}
@Override
public List<Pair<Integer, String>> getVariants() {
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "normal"));
return ret;