Lots of find replaces and random fixes

This commit is contained in:
Vincent Lee committed 2017-06-16 07:52:59 -05:00
1 parent e85cd75a57
commit 5c145362d8
93 files changed
+307 -345

No files matched your search

@@ -15,6 +15,7 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
@@ -25,7 +26,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.stats.Achievement;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
@@ -39,13 +39,11 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewItem;
import vazkii.botania.common.achievement.IPickupAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.lib.LibMisc;
public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement {
public abstract class ItemBrewBase extends ItemMod implements IBrewItem {
private static final String TAG_BREW_KEY = "brewKey";
private static final String TAG_SWIGS_LEFT = "swigsLeft";
@@ -115,9 +113,9 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList<ItemStack> list) {
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
for(String s : BotaniaAPI.brewMap.keySet()) {
ItemStack stack = new ItemStack(item);
ItemStack stack = new ItemStack(this);
setBrew(stack, s);
list.add(stack);
}
@@ -131,7 +129,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
@SideOnly(Side.CLIENT)
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean adv) {
public void addInformation(ItemStack stack, World world, List<String> list, ITooltipFlag flags) {
Brew brew = getBrew(stack);
for(PotionEffect effect : brew.getPotionEffects(stack)) {
TextFormatting format = effect.getPotion().isBadEffect() ? TextFormatting.RED : TextFormatting.GRAY;
@@ -160,10 +158,4 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
public void setSwigsLeft(ItemStack stack, int swigs) {
ItemNBTHelper.setInt(stack, TAG_SWIGS_LEFT, swigs);
}
@Override
public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) {
return ModAchievements.brewPickup;
}
}