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

Formatting pass.

Browse source
This commit is contained in:
WayofTime 2016-05-02 20:56:32 -04:00
parent 1e9f3dadd3
commit 25108a5838
13 changed files with 90 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
View file

@ -72,7 +72,7 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider
if (!getActivated(stack))
return 1.0F;
return state.getMaterial() != Material.IRON && state.getMaterial() != Material.ANVIL&& state.getMaterial() != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial;
return state.getMaterial() != Material.IRON && state.getMaterial() != Material.ANVIL && state.getMaterial() != Material.ROCK ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial;
}
@Override

15
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -184,10 +184,13 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
@Override
@SideOnly(Side.CLIENT)
public ItemMeshDefinition getMeshDefinition() {
return new ItemMeshDefinition() {
public ItemMeshDefinition getMeshDefinition()
{
return new ItemMeshDefinition()
{
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
public ModelResourceLocation getModelLocation(ItemStack stack)
{
String variant = "type=normal";
if (stack.getItemDamage() != 0)
variant = "type=creative";
@ -201,7 +204,8 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
}
@Override
public List<String> getVariants() {
public List<String> getVariants()
{
List<String> variants = new ArrayList<String>();
variants.add("type=normal");
variants.add("type=creative");
@ -211,7 +215,8 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
@Nullable
@Override
public ResourceLocation getCustomLocation() {
public ResourceLocation getCustomLocation()
{
return null;
}
}

3
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -64,8 +64,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
if (position == null)
{
return super.onItemRightClick(stack, world, player, EnumHand.MAIN_HAND);
}
else
} else
{
if (position.typeOfHit == RayTraceResult.Type.BLOCK)
{

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java
View file

@ -77,7 +77,7 @@ public class ItemSigilTransposition extends ItemSigilBase
NBTTagCompound tileNBTTag = new NBTTagCompound();
String blockName = rightClickedBlock.getBlock().getRegistryName().toString();
byte metadata = (byte) rightClickedBlock.getMeta();
byte metadata = (byte) rightClickedBlock.getMeta();
if (world.getTileEntity(blockPos) != null)
{