mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Terrasteel armor tweaks, new effects and recipes
This commit is contained in:
1 parent
1b25357616
commit
2dc664eade
5 files changed
+47
-8
No files matched your search
@@ -680,21 +680,39 @@ public final class ModCraftingRecipes {
|
||||
recipeGrassHorn = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Terrasteel Armor Recipes
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelHelmRevealing),
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[4],
|
||||
'A', new ItemStack(ModItems.manasteelHelmRevealing));
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelHelm),
|
||||
"SSS", "S S",
|
||||
'S', LibOreDict.TERRA_STEEL);
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[4],
|
||||
'A', new ItemStack(ModItems.manasteelHelm));
|
||||
recipeTerrasteelHelm = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelChest),
|
||||
"S S", "SSS", "SSS",
|
||||
'S', LibOreDict.TERRA_STEEL);
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[5],
|
||||
'A', new ItemStack(ModItems.manasteelChest));
|
||||
recipeTerrasteelChest = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelLegs),
|
||||
"SSS", "S S", "S S",
|
||||
'S', LibOreDict.TERRA_STEEL);
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[6],
|
||||
'A', new ItemStack(ModItems.manasteelLegs));
|
||||
recipeTerrasteelLegs = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelBoots),
|
||||
"S S", "S S",
|
||||
'S', LibOreDict.TERRA_STEEL);
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[7],
|
||||
'A', new ItemStack(ModItems.manasteelBoots));
|
||||
recipeTerrasteelBoots = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Terra Blade Recipe
|
||||
|
||||
+2
@@ -52,6 +52,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
|
||||
private static final String TAG_PHANTOM_INK = "phantomInk";
|
||||
|
||||
protected ModelBiped[] models = null;
|
||||
public int type;
|
||||
|
||||
public ItemManasteelArmor(int type, String name) {
|
||||
this(type, name, BotaniaAPI.manasteelArmorMaterial);
|
||||
@@ -59,6 +60,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
|
||||
|
||||
public ItemManasteelArmor(int type, String name, ArmorMaterial mat) {
|
||||
super(mat, 0, type);
|
||||
this.type = type;
|
||||
setCreativeTab(BotaniaCreativeTab.INSTANCE);
|
||||
setUnlocalizedName(name);
|
||||
}
|
||||
|
||||
+16
@@ -11,8 +11,11 @@
|
||||
package vazkii.botania.common.item.equipment.armor.terrasteel;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
@@ -22,6 +25,10 @@ import vazkii.botania.client.model.armor.ModelArmorTerrasteel;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -46,6 +53,14 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor {
|
||||
public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
|
||||
return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap getItemAttributeModifiers() {
|
||||
Multimap multimap = HashMultimap.create();
|
||||
UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0);
|
||||
multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0));
|
||||
return multimap;
|
||||
}
|
||||
|
||||
static ItemStack[] armorset;
|
||||
|
||||
@@ -87,6 +102,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor {
|
||||
public void addArmorSetDescription(ItemStack stack, List<String> list) {
|
||||
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc0"), list);
|
||||
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc1"), list);
|
||||
addStringToTooltip(StatCollector.translateToLocal("botania.armorset.terrasteel.desc2"), list);
|
||||
}
|
||||
|
||||
}
|
||||
+2
@@ -34,6 +34,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.item.IAncientWillContainer;
|
||||
import vazkii.botania.api.item.IBaubleRender.Helper;
|
||||
import vazkii.botania.api.mana.IManaDiscountArmor;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
@@ -69,6 +70,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
|
||||
int food = player.getFoodStats().getFoodLevel();
|
||||
if(food > 0 && food < 18 && player.shouldHeal() && player.ticksExisted % 80 == 0)
|
||||
player.heal(1F);
|
||||
ManaItemHandler.dispatchManaExact(stack, (EntityPlayer) player, 1, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user