Merge pull request #21 from Anonymous1432/master

Remodeled HeatControl Cooking
This commit is contained in:
MistPhizzle 2014-08-23 10:32:17 -04:00
commit 26a3773e17

View file

@ -75,9 +75,8 @@ public class Cook {
} }
private void cook() { private void cook() {
Material cooked = getCooked(items.getType()); ItemStack cooked = getCooked(items);
ItemStack newitem = new ItemStack(cooked); HashMap<Integer, ItemStack> cantfit = player.getInventory().addItem(cooked);
HashMap<Integer, ItemStack> cantfit = player.getInventory().addItem(newitem);
for (int id : cantfit.keySet()) { for (int id : cantfit.keySet()) {
player.getWorld().dropItem(player.getEyeLocation(), cantfit.get(id)); player.getWorld().dropItem(player.getEyeLocation(), cantfit.get(id));
} }
@ -90,24 +89,32 @@ public class Cook {
} }
} }
private Material getCooked(Material material) { private ItemStack getCooked(ItemStack is) {
Material cooked = Material.AIR; ItemStack cooked = new ItemStack(Material.AIR);
Material material = is.getType();
switch (material) { switch (material) {
case RAW_BEEF: case RAW_BEEF:
cooked = Material.COOKED_BEEF; cooked = new ItemStack(Material.COOKED_BEEF, 1);
break; break;
case RAW_FISH: case RAW_FISH:
cooked = Material.COOKED_FISH; ItemStack salmon = new ItemStack(Material.RAW_FISH, 1, (short) 1);
if(is.getDurability() == salmon.getDurability()) {
cooked = new ItemStack(Material.COOKED_FISH, 1, (short) 1);
}else{
cooked = new ItemStack(Material.COOKED_FISH, 1);
}
break; break;
case RAW_CHICKEN: case RAW_CHICKEN:
cooked = Material.COOKED_CHICKEN; cooked = new ItemStack(Material.COOKED_CHICKEN, 1);
break; break;
case PORK: case PORK:
cooked = Material.GRILLED_PORK; cooked = new ItemStack(Material.GRILLED_PORK, 1);
break; break;
case POTATO_ITEM: case POTATO_ITEM:
cooked = Material.BAKED_POTATO; cooked = new ItemStack(Material.BAKED_POTATO, 1);
break; break;
default:
break; //Shouldn't happen
} }
return cooked; return cooked;
} }