From fdac54cd7e00ed6de733a93280ced411d3d745ad Mon Sep 17 00:00:00 2001 From: squeek Date: Sun, 20 Jul 2014 17:05:57 -0700 Subject: [PATCH] Made SpecialFood use 1.7.10 methods to get hunger/saturation values and fixed bacon crash Closes SlimeKnights/TinkersConstruct#729 --- .../java/tconstruct/world/items/SpecialFood.java | 15 ++++++++------- .../java/tconstruct/world/items/StrangeFood.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java index 6bbf4ce146c..33f5c244fe4 100644 --- a/src/main/java/tconstruct/world/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -32,14 +32,15 @@ public SpecialFood(int[] hunger, float[] saturation, String[] textureNames, Stri } @Override - public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) + public int func_150905_g(ItemStack stack) { - stack.stackSize--; - int damage = stack.getItemDamage(); - player.getFoodStats().addStats(hunger[damage], saturation[damage]); - world.playSoundAtEntity(player, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); - this.onFoodEaten(stack, world, player); - return stack; + return hunger[stack.getItemDamage()]; + } + + @Override + public float func_150906_h(ItemStack stack) + { + return saturation[stack.getItemDamage()]; } @Override diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index 7e56232a61f..d2736044c85 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -15,7 +15,7 @@ public class StrangeFood extends SpecialFood { public StrangeFood() { - super(new int[] { 2, 2 }, new float[] { 1f, 1f }, new String[] { "edibleslime", "edibleblood", "bacon" }, new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" }); + super(new int[] { 2, 2, 4 }, new float[] { 1f, 1f, 0.6f }, new String[] { "edibleslime", "edibleblood", "bacon" }, new String[] { "food/edibleslime", "food/edibleblood", "food/bacon" }); } @Override