diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 2b99481c1..ee65df12a 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -345,6 +345,13 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "ingot" + name.substring(0, 1).toUpperCase() + name.substring(1)); } + CraftingHelper.addShapedOreRecipe(ItemCells.getCellByName("empty", 16, false), " T ", "T T", " T ", + 'T', "ingotTin"); + + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", + 'R', ItemIngots.getIngotByName("refinedIron")); + addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe), new ItemStack(ModItems.rubyAxe), new ItemStack(ModItems.rubyHoe), new ItemStack(ModItems.rubySpade), new ItemStack(ModItems.rubyHelmet), new ItemStack(ModItems.rubyChestplate), new ItemStack(ModItems.rubyLeggings), new ItemStack(ModItems.rubyBoots), ItemGems.getGemByName("ruby")); @@ -354,7 +361,11 @@ public class ModRecipes { addGemToolRecipes(new ItemStack(ModItems.peridotSword), new ItemStack(ModItems.peridotPickaxe), new ItemStack(ModItems.peridotAxe), new ItemStack(ModItems.peridotHoe), new ItemStack(ModItems.peridotSpade), new ItemStack(ModItems.peridotHelmet), new ItemStack(ModItems.peridotChestplate), new ItemStack(ModItems.peridotLeggings), new ItemStack(ModItems.peridotBoots), ItemGems.getGemByName("peridot")); - + + addGemToolRecipes(new ItemStack(ModItems.bronzeSword), new ItemStack(ModItems.bronzePickaxe), new ItemStack(ModItems.bronzeAxe), new ItemStack(ModItems.bronzeHoe), + new ItemStack(ModItems.bronzeSpade), new ItemStack(ModItems.bronzeHelmet), new ItemStack(ModItems.bronzeChestplate), new ItemStack(ModItems.bronzeLeggings), new ItemStack(ModItems.bronzeBoots), ItemIngots.getIngotByName("bronze")); + + CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.ironChainsaw), " SS", "SCS", "BS ", 'S', "ingotSteel", 'B', TechRebornAPI.recipeCompact.getItem("reBattery"), 'C', TechRebornAPI.recipeCompact.getItem("electronicCircuit")); diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 9b3209b96..31b3f11df 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -81,19 +82,19 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur return false; } - @SideOnly(Side.CLIENT) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (ItemNBTHelper.verifyExistance(stack, "isActive")) - { - list.add("Active"); - } else if (!ItemNBTHelper.verifyExistance(stack, "isActive")) - { - list.add("Not Active"); - } - super.addInformation(stack, player, list, par4); - } +// @SideOnly(Side.CLIENT) +// @Override +// public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) +// { +// if (ItemNBTHelper.verifyExistance(stack, "isActive")) +// { +// list.add("Active"); +// } else if (!ItemNBTHelper.verifyExistance(stack, "isActive")) +// { +// list.add("Not Active"); +// } +// super.addInformation(stack, player, list, par4); +// } @Override public boolean isRepairable() @@ -179,4 +180,10 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur { return new ModelResourceLocation(ModInfo.MOD_ID + ":" + getUnlocalizedName(stack).substring(5), "inventory"); } + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + { + tooltip.add(TextFormatting.RED + "WIP Coming Soon"); + } }