YEAH, CHRISTMAS

This commit is contained in:
Vasco Lavos committed 2015-12-19 19:11:53 +00:00
1 parent 8b40d7420c
commit deb6fa792a
4 files changed
+60 -13

No files matched your search

@@ -99,6 +99,7 @@ public final class LibResources {
public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave0.png";
public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave1.png";
public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweaveNew.png";
public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweaveNewHoliday.png";
public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png";
public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png";
public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png";
@@ -161,17 +161,21 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) {
if(GuiScreen.isShiftKeyDown()) {
addStringToTooltip(getArmorSetTitle(player), list);
addArmorSetDescription(stack, list);
ItemStack[] stacks = getArmorSetStacks();
for(int i = 0; i < stacks.length; i++)
addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list);
if(hasPhantomInk(stack))
addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list);
} else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list);
if(GuiScreen.isShiftKeyDown())
addInformationAfterShift(stack, player, list, adv);
else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list);
}
public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) {
addStringToTooltip(getArmorSetTitle(player), list);
addArmorSetDescription(stack, list);
ItemStack[] stacks = getArmorSetStacks();
for(int i = 0; i < stacks.length; i++)
addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list);
if(hasPhantomInk(stack))
addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list);
}
public void addStringToTooltip(String s, List<String> tooltip) {
tooltip.add(s.replaceAll("&", "\u00a7"));
}
@@ -13,12 +13,16 @@ package vazkii.botania.common.item.equipment.armor.manaweave;
import java.util.List;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.armor.ModelArmorManaweave;
import vazkii.botania.common.achievement.ICraftAchievement;
@@ -31,6 +35,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement {
IIcon iconChristmas;
public ItemManaweaveArmor(int type, String name) {
super(type, name, BotaniaAPI.manaweaveArmorMaterial);
}
@@ -41,12 +47,32 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi
models[slot] = new ModelArmorManaweave(slot);
return models[slot];
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
super.registerIcons(par1IconRegister);
iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday");
}
@Override
public String getArmorTextureAfterInk(ItemStack stack, int slot) {
return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANAWEAVE_NEW : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0;
return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0;
}
@Override
public IIcon getIconFromDamage(int dmg) {
return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg);
}
@Override
@SideOnly(Side.CLIENT)
public String getUnlocalizedName(ItemStack p_77667_1_) {
String name = super.getUnlocalizedName(p_77667_1_);
if(ClientProxy.jingleTheBells)
name = name.replaceAll("manaweave", "santaweave");
return name;
}
@Override
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
@@ -87,11 +113,22 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi
public String getArmorSetName() {
return StatCollector.translateToLocal("botania.armorset.manaweave.name");
}
@Override
public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) {
if(ClientProxy.jingleTheBells) {
addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list);
addStringToTooltip("", list);
}
super.addInformationAfterShift(stack, player, list, adv);
}
@Override
public void addArmorSetDescription(ItemStack stack, List<String> list) {
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc0"), list);
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list); }
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list);
}
@Override
public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) {
@@ -150,6 +150,7 @@ botaniamisc.noVideo=&4Video will be back soon. Sorry :(
botaniamisc.adaptativeConfigChanges=Botania's Adaptative Config has changed the following config defaults for you:
botaniamisc.altarRefill0=Right click with an empty hand to
botaniamisc.altarRefill1=add back the last recipe
botaniamisc.santaweaveInfo=Manaweave, changed up for the &cs&fe&ca&fs&co&fn
# NEI INTEGRATION
botania.nei.brewery=Botanical Brewery
@@ -1644,6 +1645,10 @@ item.botania:manaweaveHelm.name=Manaweave Cowl
item.botania:manaweaveChest.name=Manaweave Robe Top
item.botania:manaweaveLegs.name=Manaweave Robe Bottom
item.botania:manaweaveBoots.name=Manaweave Boots
item.botania:santaweaveHelm.name=Santaweave Cowl
item.botania:santaweaveChest.name=Santaweave Robe Top
item.botania:santaweaveLegs.name=Santaweave Robe Bottom
item.botania:santaweaveBoots.name=Santaweave Boots
item.botania:gaiaHead.name=Gaia Guardian's Head
item.botania:sextant.name=Worldshaper's Sextant
item.botania:speedUpBelt.name=Planestrider's Sash