Restore Java 6 compatibility

Removes a lot of needless TODO's
This commit is contained in:
Nicholas Ignoffo 2016-09-06 19:06:07 -07:00
parent 09b331fdbe
commit 8f48f3a2d0
2 changed files with 3 additions and 46 deletions

View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.api.livingArmour; package WayofTime.bloodmagic.api.livingArmour;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
@ -35,7 +36,7 @@ public class LivingArmourHandler
Constructor<? extends LivingArmourUpgrade> ctor = clazz.getConstructor(int.class); Constructor<? extends LivingArmourUpgrade> ctor = clazz.getConstructor(int.class);
if (ctor == null) if (ctor == null)
{ {
// TODO: This is bad - add something to the log BloodMagicAPI.getLogger().error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier());
} else } else
{ {
upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor);

View file

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.function.Consumer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
@ -165,15 +164,6 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ(); return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ();
} }
@Override
public void forEachRemaining(Consumer<? super BlockPos> action)
{
while (hasNext())
{
action.accept(next());
}
}
@Override @Override
public boolean hasNext() public boolean hasNext()
{ {
@ -387,79 +377,63 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
return blockPosCache.contains(pos); return blockPosCache.contains(pos);
} }
@Override
public void forEachRemaining(Consumer<? super BlockPos> arg0)
{
// TODO Auto-generated method stub
}
@Override @Override
public boolean hasNext() public boolean hasNext()
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public BlockPos next() public BlockPos next()
{ {
// TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public void remove() public void remove()
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public void resetIterator() public void resetIterator()
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2)
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2)
{ {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public int getVolume() public int getVolume()
{ {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public boolean isWithinRange(int verticalLimit, int horizontalLimit) public boolean isWithinRange(int verticalLimit, int horizontalLimit)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean intersects(AreaDescriptor descriptor) public boolean intersects(AreaDescriptor descriptor)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@ -472,7 +446,6 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
@Override @Override
public AreaDescriptor rotateDescriptor(PlacementSettings settings) public AreaDescriptor rotateDescriptor(PlacementSettings settings)
{ {
// TODO Auto-generated method stub
return this; return this;
} }
} }
@ -541,80 +514,63 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
return null; return null;
} }
@Override
public void forEachRemaining(Consumer<? super BlockPos> arg0)
{
// TODO Auto-generated method stub
}
@Override @Override
public void remove() public void remove()
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public void resetIterator() public void resetIterator()
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2)
{ {
// TODO Auto-generated method stub
} }
@Override @Override
public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2)
{ {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public int getVolume() public int getVolume()
{ {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public boolean isWithinRange(int verticalLimit, int horizontalLimit) public boolean isWithinRange(int verticalLimit, int horizontalLimit)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean intersects(AreaDescriptor descriptor) public boolean intersects(AreaDescriptor descriptor)
{ {
// TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public AreaDescriptor offset(BlockPos offset) public AreaDescriptor offset(BlockPos offset)
{ {
// TODO Auto-generated method stub
return new AreaDescriptor.Cross(centerPos.add(offset), size); return new AreaDescriptor.Cross(centerPos.add(offset), size);
} }
@Override @Override
public AreaDescriptor rotateDescriptor(PlacementSettings settings) public AreaDescriptor rotateDescriptor(PlacementSettings settings)
{ {
// TODO Auto-generated method stub
return this; return this;
} }
} }