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

A whole lot of formatting cleanup

Browse source 
Also changes NBTHolder to a standard Constants class with subclasses for each category
This commit is contained in:
Nick 2015-11-28 18:25:46 -08:00
parent f9802900db
commit 34dee6447b
74 changed files with 861 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.altar.IAltarManipulator;
import WayofTime.bloodmagic.api.iface.IAltarReader;
import WayofTime.bloodmagic.tile.TileAltar;
@ -20,7 +21,7 @@ public class BlockAltar extends BlockContainer {
public BlockAltar() {
super(Material.rock);
setUnlocalizedName(BloodMagic.MODID + ".altar");
setUnlocalizedName(Constants.Mod.MODID + ".altar");
setCreativeTab(BloodMagic.tabBloodMagic);
}

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

@ -1,17 +1,18 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockString;
import net.minecraft.block.material.Material;
public class BlockBloodRune extends BlockString {
public static final String[] names = { "blank", "speed", "efficiency", "sacrifice", "selfSacrifice", "displacement", "capacity", "augCapacity", "orb", "acceleration" };
public static final String[] names = {"blank", "speed", "efficiency", "sacrifice", "selfSacrifice", "displacement", "capacity", "augCapacity", "orb", "acceleration"};
public BlockBloodRune() {
super(Material.rock, names);
setUnlocalizedName(BloodMagic.MODID + ".rune.");
setUnlocalizedName(Constants.Mod.MODID + ".rune.");
setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(soundTypeStone);
setHardness(2.0F);

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

@ -1,17 +1,18 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockString;
import net.minecraft.block.material.Material;
public class BlockBloodStoneBrick extends BlockString {
public static final String[] names = { "normal", "large" };
public static final String[] names = {"normal", "large"};
public BlockBloodStoneBrick() {
super(Material.rock, names);
setUnlocalizedName(BloodMagic.MODID + ".bloodstonebrick.");
setUnlocalizedName(Constants.Mod.MODID + ".bloodstonebrick.");
setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

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

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import lombok.Getter;
import net.minecraft.block.material.Material;
import net.minecraft.util.BlockPos;
@ -23,7 +23,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
public BlockLifeEssence() {
super(lifeEssence, Material.water);
setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence");
setUnlocalizedName(Constants.Mod.MODID + ".fluid.lifeEssence");
lifeEssence.setBlock(this);
BloodMagicAPI.setLifeEssence(lifeEssence);
@ -42,7 +42,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
public static class FluidLifeEssence extends Fluid {
public FluidLifeEssence() {
super("lifeEssence", new ResourceLocation(BloodMagic.DOMAIN + "blocks/lifeEssenceStill"), new ResourceLocation(BloodMagic.DOMAIN + "blocks/lifeEssenceFlowing"));
super("lifeEssence", new ResourceLocation(Constants.Mod.DOMAIN + "blocks/lifeEssenceStill"), new ResourceLocation(Constants.Mod.DOMAIN + "blocks/lifeEssenceFlowing"));
setDensity(2000);
setViscosity(2000);

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

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.block.base.BlockStringContainer;
import WayofTime.bloodmagic.tile.TilePlinth;
import WayofTime.bloodmagic.util.Utils;
@ -15,12 +16,12 @@ import net.minecraft.world.World;
public class BlockPedestal extends BlockStringContainer {
public static String[] names = { "pedestal", "plinth" };
public static String[] names = {"pedestal", "plinth"};
public BlockPedestal() {
super(Material.rock, names);
setUnlocalizedName(BloodMagic.MODID + ".");
setUnlocalizedName(Constants.Mod.MODID + ".");
setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

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

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.BlockStack;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry;
import WayofTime.bloodmagic.block.base.BlockStringContainer;
import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
@ -16,12 +17,12 @@ import net.minecraft.world.World;
public class BlockRitualController extends BlockStringContainer {
public static final String[] names = { "master", "imperfect" };
public static final String[] names = {"master", "imperfect"};
public BlockRitualController() {
super(Material.rock, names);
setUnlocalizedName(BloodMagic.MODID + ".stone.ritual.");
setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual.");
setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(soundTypeStone);
setHardness(2.0F);

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

@ -1,30 +1,31 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IRitualStone;
import WayofTime.bloodmagic.block.base.BlockString;
import net.minecraft.block.material.Material;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IRitualStone;
public class BlockRitualStone extends BlockString implements IRitualStone {
public static final String[] names = { "blank", "water", "fire", "earth", "air", "dusk", "dawn" };
public static final String[] names = {"blank", "water", "fire", "earth", "air", "dusk", "dawn"};
public BlockRitualStone() {
super(Material.iron, names);
public BlockRitualStone() {
super(Material.iron, names);
setUnlocalizedName(BloodMagic.MODID + ".ritualStone.");
setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(soundTypeStone);
setHardness(2.0F);
setResistance(5.0F);
setHarvestLevel("pickaxe", 2);
}
setUnlocalizedName(Constants.Mod.MODID + ".ritualStone.");
setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(soundTypeStone);
setHardness(2.0F);
setResistance(5.0F);
setHarvestLevel("pickaxe", 2);
}
@Override
public boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType) {
return runeType.toString().equals(names[getMetaFromState(world.getBlockState(pos))]);
}
@Override
public boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType) {
return runeType.toString().equals(names[getMetaFromState(world.getBlockState(pos))]);
}
}

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

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger;
@ -20,13 +21,13 @@ import java.util.List;
public class BlockSocket extends Block {
public static final String[] names = { "empty", "filled" };
public static final String[] names = {"empty", "filled"};
public static final PropertyInteger META = PropertyInteger.create("META", 0, names.length - 1);
public BlockSocket() {
super(Material.iron);
setUnlocalizedName(BloodMagic.MODID + ".socket.");
setUnlocalizedName(Constants.Mod.MODID + ".socket.");
setHardness(2.0F);
setResistance(5.0F);
setStepSound(soundTypeMetal);

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

@ -1,6 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@ -14,7 +15,7 @@ public class BlockSoulForge extends Block {
public BlockSoulForge() {
super(Material.iron);
setUnlocalizedName(BloodMagic.MODID + ".soulforge.");
setUnlocalizedName(Constants.Mod.MODID + ".soulforge.");
setHardness(2.0F);
setResistance(5.0F);
setStepSound(soundTypeMetal);
@ -28,7 +29,6 @@ public class BlockSoulForge extends Block {
return false;
return false;
}
}

52
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java Normal file
View file

@ -0,0 +1,52 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.item.ItemTelepositionFocus;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
public class BlockTeleposer extends BlockContainer {
public BlockTeleposer() {
super(Material.rock);
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(Constants.Mod.MODID + ".teleposer");
setHardness(2.0F);
setResistance(5.0F);
}
@Override
public int getRenderType() {
return 3;
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) {
ItemStack playerItem = player.getCurrentEquippedItem();
if (playerItem != null && playerItem.getItem() instanceof ItemTelepositionFocus) {
BindableHelper.checkAndSetItemOwner(playerItem, player);
((ItemTelepositionFocus) playerItem.getItem()).setBlockPos(playerItem, world, pos);
return true;
}
// player.openGui(AlchemicalWizardry.instance, 1, world, pos.getX(), pos.getY(), pos.getZ());
return true;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta) {
return null;
}
}

89
src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java
View file

@ -1,5 +1,7 @@
package WayofTime.bloodmagic.block;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@ -9,59 +11,58 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import WayofTime.bloodmagic.BloodMagic;
public class BlockTestSpellBlock extends Block {
public static final PropertyDirection INPUT = PropertyDirection
.create("input");
public static final PropertyDirection OUTPUT = PropertyDirection
.create("output");
public static final PropertyDirection INPUT = PropertyDirection
.create("input");
public static final PropertyDirection OUTPUT = PropertyDirection
.create("output");
public BlockTestSpellBlock() {
super(Material.rock);
setHardness(2.0F);
setResistance(5.0F);
public BlockTestSpellBlock() {
super(Material.rock);
setHardness(2.0F);
setResistance(5.0F);
setUnlocalizedName(BloodMagic.MODID + ".testSpellBlock");
setCreativeTab(BloodMagic.tabBloodMagic);
this.setDefaultState(this.blockState.getBaseState()
.withProperty(INPUT, EnumFacing.DOWN)
.withProperty(OUTPUT, EnumFacing.UP));
}
setUnlocalizedName(Constants.Mod.MODID + ".testSpellBlock");
setCreativeTab(BloodMagic.tabBloodMagic);
this.setDefaultState(this.blockState.getBaseState()
.withProperty(INPUT, EnumFacing.DOWN)
.withProperty(OUTPUT, EnumFacing.UP));
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState();
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState();
}
@Override
public int getMetaFromState(IBlockState state) {
return 0;
}
@Override
public int getMetaFromState(IBlockState state) {
return 0;
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
return state.withProperty(INPUT, EnumFacing.DOWN)
.withProperty(OUTPUT, EnumFacing.UP);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
return state.withProperty(INPUT, EnumFacing.DOWN)
.withProperty(OUTPUT, EnumFacing.UP);
}
@Override
protected BlockState createBlockState() {
return new BlockState(this, new IProperty[] { INPUT, OUTPUT });
}
@Override
protected BlockState createBlockState() {
return new BlockState(this, new IProperty[]{INPUT, OUTPUT});
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean isFullCube() {
return false;
}
@Override
public boolean isFullCube() {
return false;
}
@Override
public boolean isPassable(IBlockAccess blockAccess, BlockPos pos) {
return false;
}
@Override
public boolean isPassable(IBlockAccess blockAccess, BlockPos pos) {
return false;
}
}

6
src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
View file

@ -26,9 +26,9 @@ import java.util.List;
/**
* Creates a block that has multiple meta-based states.
*
* <p/>
* These states will be numbered 0 through {@code maxMeta}.
*
* <p/>
* For {@link net.minecraft.tileentity.TileEntity}'s, use {@link BlockIntegerContainer}.
*/
@Getter
@ -105,6 +105,6 @@ public class BlockInteger extends Block {
}
private BlockState createRealBlockState() {
return new ExtendedBlockState(this, new IProperty[] { metaProp }, new IUnlistedProperty[] { unlistedMetaProp });
return new ExtendedBlockState(this, new IProperty[]{metaProp}, new IUnlistedProperty[]{unlistedMetaProp});
}
}

6
src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
View file

@ -27,10 +27,10 @@ import java.util.List;
/**
* Creates a block that has multiple meta-based states.
*
* <p/>
* These states will be named after the given string array. Somewhere along the way, each
* value is {@code toLowerCase()}'ed, so the blockstate JSON needs all values to be lowercase.
*
* <p/>
* For {@link net.minecraft.tileentity.TileEntity}'s, use {@link BlockStringContainer}.
*/
@Getter
@ -109,6 +109,6 @@ public class BlockString extends Block {
}
private BlockState createRealBlockState() {
return new ExtendedBlockState(this, new IProperty[] { stringProp }, new IUnlistedProperty[] { unlistedStringProp });
return new ExtendedBlockState(this, new IProperty[]{stringProp}, new IUnlistedProperty[]{unlistedStringProp});
}
}

8
src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java
View file

@ -21,6 +21,10 @@ public class PropertyString extends PropertyHelper {
allowedValues = ImmutableSet.copyOf(hashSet);
}
public static PropertyString create(String name, String[] values) {
return new PropertyString(name, values);
}
@Override
public Collection getAllowedValues() {
return allowedValues;
@ -34,8 +38,4 @@ public class PropertyString extends PropertyHelper {
public String getName(Comparable value) {
return this.getName0(value.toString());
}
public static PropertyString create(String name, String[] values) {
return new PropertyString(name, values);
}
}