Upload my Code Changes/Format/imports

This commit is contained in:
Alexander committed 2014-02-16 14:23:50 -05:00
1 parent 5bcdb7ca46
commit 5d4e38c0cb
264 files changed
+4014 -3972

No files matched your search

@@ -28,11 +28,9 @@ public class Scythe extends Weapon
this.setUnlocalizedName("InfiTool.Scythe");
}
/*@Override
protected String getHarvestType()
{
return "sword";
}*/
/*
* @Override protected String getHarvestType() { return "sword"; }
*/
@Override
protected Material[] getEffectiveMaterials ()
@@ -40,7 +38,9 @@ public class Scythe extends Weapon
return materials;
}
static Material[] materials = new Material[] { Material.web, Material.cactus };//TODO find this//, Material.pumpkin, Material.plants, Material.vine, Material.leaves };
static Material[] materials = new Material[] { Material.web, Material.cactus };// TODO find this//, Material.pumpkin,
// Material.plants, Material.vine,
// Material.leaves };
@Override
public Item getHeadItem ()
@@ -178,7 +178,10 @@ public class Scythe extends Weapon
if (!cancelHarvest)
{
Block block = world.getBlock(xPos, yPos, zPos);
if (block != null)// && (block.getMaterial() == Material.leaves || block.isLeaves(world, xPos, yPos, zPos)))
if (block != null)// && (block.getMaterial() ==
// Material.leaves ||
// block.isLeaves(world, xPos,
// yPos, zPos)))
{
for (int iter = 0; iter < materials.length; iter++)
{