PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added toxicity indicators to more food items

Browse source
This commit is contained in:
Sollace 2019-01-31 15:58:24 +02:00
parent 3129084f71
commit ad327c6831
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/edibles/UItemFoodDelegate.java
View file

@ -1,8 +1,12 @@
package com.minelittlepony.unicopia.edibles; package com.minelittlepony.unicopia.edibles;
import java.util.List;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction; import net.minecraft.item.EnumAction;
@ -27,6 +31,11 @@ public class UItemFoodDelegate extends ItemMultiTexture implements IEdible {
return this; return this;
} }
@Override
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
foodItem.addInformation(stack, worldIn, tooltip, flagIn);
}
@Override @Override
public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) { public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
return foodItem.onItemUseFinish(stack, worldIn, entityLiving); return foodItem.onItemUseFinish(stack, worldIn, entityLiving);

20
src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
View file

@ -1,17 +1,24 @@
package com.minelittlepony.unicopia.item; package com.minelittlepony.unicopia.item;
import java.util.List;
import java.util.Random; import java.util.Random;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.UItems; import com.minelittlepony.unicopia.UItems;
import com.minelittlepony.unicopia.edibles.IEdible;
import com.minelittlepony.unicopia.edibles.Toxicity;
import com.minelittlepony.unicopia.forgebullshit.IMultiItem; import com.minelittlepony.unicopia.forgebullshit.IMultiItem;
import net.minecraft.block.BlockPlanks; import net.minecraft.block.BlockPlanks;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemFood; import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
public class ItemApple extends ItemFood implements IMultiItem { public class ItemApple extends ItemFood implements IMultiItem, IEdible {
private int[] typeRarities = new int[0]; private int[] typeRarities = new int[0];
@ -115,9 +122,9 @@ public class ItemApple extends ItemFood implements IMultiItem {
} }
} }
@Override @Override
public int getDamage(ItemStack stack) { public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
return super.getDamage(stack);// % subTypes.length; tooltip.add(getToxicityLevel(stack).getTooltip());
} }
@Override @Override
@ -141,4 +148,9 @@ public class ItemApple extends ItemFood implements IMultiItem {
return super.getTranslationKey(stack); return super.getTranslationKey(stack);
} }
@Override
public Toxicity getToxicityLevel(ItemStack stack) {
return Toxicity.SAFE;
}
} }

7
src/main/java/com/minelittlepony/unicopia/item/ItemZapApple.java
View file

@ -1,5 +1,7 @@
package com.minelittlepony.unicopia.item; package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.edibles.Toxicity;
import com.minelittlepony.util.MagicalDamageSource; import com.minelittlepony.util.MagicalDamageSource;
import com.minelittlepony.util.vector.VecHelper; import com.minelittlepony.util.vector.VecHelper;
@ -73,6 +75,11 @@ public class ItemZapApple extends ItemApple {
} }
} }
@Override
public Toxicity getToxicityLevel(ItemStack stack) {
return stack.getMetadata() == 0 ? Toxicity.SEVERE : Toxicity.SAFE;
}
@Override @Override
public EnumRarity getRarity(ItemStack stack) { public EnumRarity getRarity(ItemStack stack) {
int meta = stack.getMetadata(); int meta = stack.getMetadata();