mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 11:49:37 +00:00
Armor keeps enchantments when crafted (#213)
* Armor keeps enchantments when crafted Closes #209 * Copy runic shielding as well
This commit is contained in:
1 parent
d33590f7ca
commit
9e82e5357a
2 files changed
+55
-10
No files matched your search
@@ -38,6 +38,7 @@ import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.ModFluffBlocks;
|
||||
import vazkii.botania.common.block.tile.TileCraftCrate;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe;
|
||||
import vazkii.botania.common.item.ItemSignalFlare;
|
||||
import vazkii.botania.common.item.ItemTwigWand;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -714,39 +715,39 @@ public final class ModCraftingRecipes {
|
||||
recipeGrassHorn = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Terrasteel Armor Recipes
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelHelmRevealing),
|
||||
GameRegistry.addRecipe(new ArmorUpgradeRecipe(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),
|
||||
'A', new ItemStack(ModItems.manasteelHelmRevealing)));
|
||||
GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelHelm),
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[4],
|
||||
'A', new ItemStack(ModItems.manasteelHelm));
|
||||
'A', new ItemStack(ModItems.manasteelHelm)));
|
||||
recipeTerrasteelHelm = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelChest),
|
||||
GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelChest),
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[5],
|
||||
'A', new ItemStack(ModItems.manasteelChest));
|
||||
'A', new ItemStack(ModItems.manasteelChest)));
|
||||
recipeTerrasteelChest = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelLegs),
|
||||
GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelLegs),
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[6],
|
||||
'A', new ItemStack(ModItems.manasteelLegs));
|
||||
'A', new ItemStack(ModItems.manasteelLegs)));
|
||||
recipeTerrasteelLegs = BotaniaAPI.getLatestAddedRecipe();
|
||||
addOreDictRecipe(new ItemStack(ModItems.terrasteelBoots),
|
||||
GameRegistry.addRecipe(new ArmorUpgradeRecipe(new ItemStack(ModItems.terrasteelBoots),
|
||||
"TRT", "SAS", " S ",
|
||||
'T', LibOreDict.LIVINGWOOD_TWIG,
|
||||
'S', LibOreDict.TERRA_STEEL,
|
||||
'R', LibOreDict.RUNE[7],
|
||||
'A', new ItemStack(ModItems.manasteelBoots));
|
||||
'A', new ItemStack(ModItems.manasteelBoots)));
|
||||
recipeTerrasteelBoots = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Terra Blade Recipe
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
/**
|
||||
* This class was created by <WireSegal>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [Apr 4, 2016, 7:49:08 PM (EST)]
|
||||
*/
|
||||
package vazkii.botania.common.crafting.recipe;
|
||||
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
|
||||
public class ArmorUpgradeRecipe extends ShapedOreRecipe {
|
||||
|
||||
public ArmorUpgradeRecipe(ItemStack output, Object... inputs) {
|
||||
super(output, inputs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting var1) {
|
||||
ItemStack out = output.copy();
|
||||
for (int i = 0; i < var1.getSizeInventory(); i++) {
|
||||
ItemStack stack = var1.getStackInSlot(i);
|
||||
if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) {
|
||||
NBTTagList list = ItemNBTHelper.getList(stack, "ench", 10, true);
|
||||
if (list != null) {
|
||||
ItemNBTHelper.setList(out, "ench", list);
|
||||
return out;
|
||||
}
|
||||
byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0);
|
||||
if (runicHardening != 0)
|
||||
ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening);
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user