mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Fixed ItemForestryFood not extending ItemFood.
This commit is contained in:
1 parent
2581dfa344
commit
6e8590308f
2 files changed
+41
-6
No files matched your search
@@ -10,8 +10,14 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.items;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.core.render.TextureManager;
|
||||
import forestry.core.utils.StringUtil;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.ItemFood;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.world.World;
|
||||
@@ -19,7 +25,7 @@ import net.minecraft.world.World;
|
||||
|
||||
import forestry.core.CreativeTabForestry;
|
||||
|
||||
public class ItemForestryFood extends ItemForestry {
|
||||
public class ItemForestryFood extends ItemFood {
|
||||
|
||||
private boolean isAlwaysEdible = false;
|
||||
private boolean isDrink = false;
|
||||
@@ -37,12 +43,22 @@ public class ItemForestryFood extends ItemForestry {
|
||||
}
|
||||
|
||||
public ItemForestryFood(int heal, float saturation) {
|
||||
super();
|
||||
super(0, 0, false);
|
||||
healAmount = heal;
|
||||
saturationModifier = saturation;
|
||||
setCreativeTab(CreativeTabForestry.tabForestry);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int func_150905_g(ItemStack p_150905_1_) {
|
||||
return healAmount;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float func_150906_h(ItemStack p_150906_1_) {
|
||||
return saturationModifier;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) {
|
||||
itemstack.stackSize--;
|
||||
@@ -92,4 +108,10 @@ public class ItemForestryFood extends ItemForestry {
|
||||
return this;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,6 +12,7 @@ package forestry.food.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import forestry.core.items.ItemForestryFood;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -28,12 +29,11 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.food.BeverageManager;
|
||||
import forestry.api.food.IBeverageEffect;
|
||||
import forestry.core.CreativeTabForestry;
|
||||
import forestry.core.config.Config;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.render.TextureManager;
|
||||
|
||||
public class ItemBeverage extends Item {
|
||||
public class ItemBeverage extends ItemForestryFood {
|
||||
|
||||
public static class BeverageInfo {
|
||||
|
||||
@@ -113,10 +113,9 @@ public class ItemBeverage extends Item {
|
||||
public BeverageInfo[] beverages;
|
||||
|
||||
public ItemBeverage(BeverageInfo... beverages) {
|
||||
super();
|
||||
super(1, 0.2f);
|
||||
setMaxStackSize(1);
|
||||
this.beverages = beverages;
|
||||
setCreativeTab(CreativeTabForestry.tabForestry);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -147,6 +146,20 @@ public class ItemBeverage extends Item {
|
||||
return itemstack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int func_150905_g(ItemStack itemstack) {
|
||||
int meta = itemstack.getItemDamage();
|
||||
BeverageInfo beverage = beverages[meta];
|
||||
return beverage.heal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float func_150906_h(ItemStack itemstack) {
|
||||
int meta = itemstack.getItemDamage();
|
||||
BeverageInfo beverage = beverages[meta];
|
||||
return beverage.saturation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxItemUseDuration(ItemStack itemstack) {
|
||||
return 32;
|
||||
|
||||
Reference in new issue
Block a user