Fixes #321 - And I tested it so I know it works

This commit is contained in:
modmuss50 2016-01-09 11:41:16 +00:00
parent be2f5f9e52
commit 2b54516bdd

View file

@ -27,6 +27,7 @@ import techreborn.init.ModBlocks;
import techreborn.items.ItemDusts; import techreborn.items.ItemDusts;
import techreborn.items.ItemGems; import techreborn.items.ItemGems;
import java.security.InvalidParameterException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -34,14 +35,12 @@ import java.util.Random;
public class BlockOre extends BaseBlock implements IBlockTextureProvider { public class BlockOre extends BaseBlock implements IBlockTextureProvider {
public static ItemStack getOreByName(String name, int count) { public static ItemStack getOreByName(String name, int count) {
int index = -1;
for (int i = 0; i < types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i].equals(name)) { if (types[i].equals(name)) {
index = i; return new ItemStack(ModBlocks.ore, count, i);
break;
} }
} }
return new ItemStack(ModBlocks.ore, count, index); throw new InvalidParameterException("The storage block " + name + " could not be found.");
} }
public static ItemStack getOreByName(String name) { public static ItemStack getOreByName(String name) {
@ -180,12 +179,12 @@ public class BlockOre extends BaseBlock implements IBlockTextureProvider {
@Override @Override
public int getMetaFromState(IBlockState state) { public int getMetaFromState(IBlockState state) {
return (Integer) state.getValue(METADATA); return state.getValue(METADATA);
} }
protected BlockState createBlockState() { protected BlockState createBlockState() {
METADATA = PropertyInteger.create("Type", 0, types.length); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockState(this, METADATA);
} }