diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml
index a5799dca..484293be 100644
--- a/assets/tinker/lang/en_US.xml
+++ b/assets/tinker/lang/en_US.xml
@@ -277,6 +277,7 @@
Bowstring
Enchanted Bowstring
+ Fiery Bowstring
Feather Fletching
Leaf Fletching
Slime Fletching
diff --git a/assets/tinker/textures/items/parts/flamestring_bowstring.png b/assets/tinker/textures/items/parts/flamestring_bowstring.png
new file mode 100644
index 00000000..b9dd5049
Binary files /dev/null and b/assets/tinker/textures/items/parts/flamestring_bowstring.png differ
diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring.png
new file mode 100644
index 00000000..1011b681
Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring.png differ
diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png
new file mode 100644
index 00000000..db8d190d
Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png differ
diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png
new file mode 100644
index 00000000..89d92080
Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png differ
diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png
new file mode 100644
index 00000000..9595fa27
Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png differ
diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png
new file mode 100644
index 00000000..efb10460
Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png differ
diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java
index b75051a3..51b3eb95 100644
--- a/tconstruct/client/TProxyClient.java
+++ b/tconstruct/client/TProxyClient.java
@@ -823,7 +823,7 @@ public class TProxyClient extends TProxyCommon
}
}
- String[] bowstringTypes = { "string", "magicfabric" };
+ String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
{
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java
index 537e5ba5..fc8efb01 100644
--- a/tconstruct/common/TContent.java
+++ b/tconstruct/common/TContent.java
@@ -1,216 +1,48 @@
package tconstruct.common;
import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+
+import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.*;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.block.StepSound;
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.material.MaterialLiquid;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.FurnaceRecipes;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.Potion;
-import net.minecraft.util.WeightedRandomChestContent;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.BiomeDictionary;
-import net.minecraftforge.common.ChestGenHooks;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
import tconstruct.TConstruct;
-import tconstruct.blocks.Aggregator;
-import tconstruct.blocks.CraftingSlab;
-import tconstruct.blocks.CraftingStationBlock;
-import tconstruct.blocks.DryingRack;
-import tconstruct.blocks.EquipBlock;
-import tconstruct.blocks.EssenceExtractor;
-import tconstruct.blocks.GlassBlockConnected;
-import tconstruct.blocks.GlassBlockConnectedMeta;
-import tconstruct.blocks.GlassPane;
-import tconstruct.blocks.GlassPaneStained;
-import tconstruct.blocks.GravelOre;
-import tconstruct.blocks.LavaTankBlock;
-import tconstruct.blocks.LightCrystalBase;
-import tconstruct.blocks.LiquidMetalFinite;
-import tconstruct.blocks.MeatBlock;
-import tconstruct.blocks.MetalOre;
-import tconstruct.blocks.MultiBrick;
-import tconstruct.blocks.MultiBrickFancy;
-import tconstruct.blocks.OreberryBush;
-import tconstruct.blocks.OreberryBushEssence;
-import tconstruct.blocks.RedstoneMachine;
-import tconstruct.blocks.SearedBlock;
-import tconstruct.blocks.SearedSlab;
-import tconstruct.blocks.SlabBase;
-import tconstruct.blocks.SmelteryBlock;
-import tconstruct.blocks.SoilBlock;
-import tconstruct.blocks.SpeedBlock;
-import tconstruct.blocks.SpeedSlab;
-import tconstruct.blocks.StoneTorch;
-import tconstruct.blocks.TMetalBlock;
-import tconstruct.blocks.ToolForgeBlock;
-import tconstruct.blocks.ToolStationBlock;
-import tconstruct.blocks.logic.CastingBasinLogic;
-import tconstruct.blocks.logic.CastingTableLogic;
-import tconstruct.blocks.logic.CraftingStationLogic;
-import tconstruct.blocks.logic.DrawbridgeLogic;
-import tconstruct.blocks.logic.DryingRackLogic;
-import tconstruct.blocks.logic.EssenceExtractorLogic;
-import tconstruct.blocks.logic.FaucetLogic;
-import tconstruct.blocks.logic.FirestarterLogic;
-import tconstruct.blocks.logic.FrypanLogic;
-import tconstruct.blocks.logic.GlowstoneAggregator;
-import tconstruct.blocks.logic.LavaTankLogic;
-import tconstruct.blocks.logic.MultiServantLogic;
-import tconstruct.blocks.logic.PartBuilderLogic;
-import tconstruct.blocks.logic.PatternChestLogic;
-import tconstruct.blocks.logic.SmelteryDrainLogic;
-import tconstruct.blocks.logic.SmelteryLogic;
-import tconstruct.blocks.logic.StencilTableLogic;
-import tconstruct.blocks.logic.ToolForgeLogic;
-import tconstruct.blocks.logic.ToolStationLogic;
-import tconstruct.blocks.slime.SlimeFluid;
-import tconstruct.blocks.slime.SlimeGel;
-import tconstruct.blocks.slime.SlimeGrass;
-import tconstruct.blocks.slime.SlimeLeaves;
-import tconstruct.blocks.slime.SlimeSapling;
-import tconstruct.blocks.slime.SlimeTallGrass;
-import tconstruct.blocks.traps.BarricadeBlock;
-import tconstruct.blocks.traps.Punji;
+import tconstruct.blocks.*;
+import tconstruct.blocks.logic.*;
+import tconstruct.blocks.slime.*;
+import tconstruct.blocks.traps.*;
import tconstruct.client.StepSoundSlime;
-import tconstruct.entity.Automaton;
-import tconstruct.entity.BlueSlime;
-import tconstruct.entity.Crystal;
-import tconstruct.entity.FancyEntityItem;
-import tconstruct.entity.MiniGardy;
-import tconstruct.entity.SlimeClone;
-import tconstruct.entity.projectile.ArrowEntity;
-import tconstruct.entity.projectile.DaggerEntity;
-import tconstruct.entity.projectile.LaunchedPotion;
-import tconstruct.items.Bowstring;
-import tconstruct.items.CraftingItem;
-import tconstruct.items.DiamondApple;
-import tconstruct.items.EssenceCrystal;
-import tconstruct.items.FilledBucket;
-import tconstruct.items.Fletching;
-import tconstruct.items.GoldenHead;
-import tconstruct.items.Manual;
-import tconstruct.items.MaterialItem;
-import tconstruct.items.MetalPattern;
-import tconstruct.items.OreBerries;
-import tconstruct.items.Pattern;
-import tconstruct.items.StrangeFood;
-import tconstruct.items.TitleIcon;
-import tconstruct.items.ToolPart;
-import tconstruct.items.ToolPartHidden;
-import tconstruct.items.ToolShard;
-import tconstruct.items.armor.Glove;
-import tconstruct.items.armor.HeartCanister;
-import tconstruct.items.armor.Knapsack;
-import tconstruct.items.armor.TArmorBase;
-import tconstruct.items.blocks.BarricadeItem;
-import tconstruct.items.blocks.CraftedSoilItemBlock;
-import tconstruct.items.blocks.CraftingSlabItemBlock;
-import tconstruct.items.blocks.GlassBlockItem;
-import tconstruct.items.blocks.GlassPaneItem;
-import tconstruct.items.blocks.GravelOreItem;
-import tconstruct.items.blocks.LavaTankItemBlock;
-import tconstruct.items.blocks.LightCrystalItem;
-import tconstruct.items.blocks.MetalItemBlock;
-import tconstruct.items.blocks.MetalOreItemBlock;
-import tconstruct.items.blocks.MultiBrickFancyItem;
-import tconstruct.items.blocks.MultiBrickItem;
-import tconstruct.items.blocks.OreberryBushItem;
-import tconstruct.items.blocks.OreberryBushSecondItem;
-import tconstruct.items.blocks.RedstoneMachineItem;
-import tconstruct.items.blocks.SearedSlabItem;
-import tconstruct.items.blocks.SearedTableItemBlock;
-import tconstruct.items.blocks.SlimeGelItemBlock;
-import tconstruct.items.blocks.SlimeGrassItemBlock;
-import tconstruct.items.blocks.SlimeLeavesItemBlock;
-import tconstruct.items.blocks.SlimeSaplingItemBlock;
-import tconstruct.items.blocks.SlimeTallGrassItem;
-import tconstruct.items.blocks.SmelteryItemBlock;
-import tconstruct.items.blocks.SpeedBlockItem;
-import tconstruct.items.blocks.SpeedSlabItem;
-import tconstruct.items.blocks.StainedGlassClearItem;
-import tconstruct.items.blocks.StainedGlassClearPaneItem;
-import tconstruct.items.blocks.ToolForgeItemBlock;
-import tconstruct.items.blocks.ToolStationItemBlock;
-import tconstruct.items.blocks.WoolSlab1Item;
-import tconstruct.items.blocks.WoolSlab2Item;
-import tconstruct.items.tools.Arrow;
-import tconstruct.items.tools.BattleSign;
-import tconstruct.items.tools.Battleaxe;
-import tconstruct.items.tools.Broadsword;
-import tconstruct.items.tools.Chisel;
-import tconstruct.items.tools.Cleaver;
-import tconstruct.items.tools.Cutlass;
-import tconstruct.items.tools.Dagger;
-import tconstruct.items.tools.Excavator;
-import tconstruct.items.tools.FryingPan;
-import tconstruct.items.tools.Hammer;
-import tconstruct.items.tools.Hatchet;
-import tconstruct.items.tools.Longsword;
-import tconstruct.items.tools.LumberAxe;
-import tconstruct.items.tools.Mattock;
-import tconstruct.items.tools.Pickaxe;
-import tconstruct.items.tools.PotionLauncher;
-import tconstruct.items.tools.Rapier;
-import tconstruct.items.tools.Scythe;
-import tconstruct.items.tools.Shortbow;
-import tconstruct.items.tools.Shovel;
+import tconstruct.entity.*;
+import tconstruct.entity.projectile.*;
+import tconstruct.items.*;
+import tconstruct.items.armor.*;
+import tconstruct.items.blocks.*;
+import tconstruct.items.tools.*;
import tconstruct.landmine.block.BlockLandmine;
import tconstruct.landmine.item.ItemBlockLandmine;
import tconstruct.landmine.tileentity.TileEntityLandmine;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.Detailing;
-import tconstruct.library.crafting.DryingRackRecipes;
-import tconstruct.library.crafting.LiquidCasting;
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.crafting.Smeltery;
-import tconstruct.library.crafting.ToolBuilder;
+import tconstruct.library.crafting.*;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.util.IPattern;
-import tconstruct.modifiers.ModAntiSpider;
-import tconstruct.modifiers.ModAttack;
-import tconstruct.modifiers.ModAutoSmelt;
-import tconstruct.modifiers.ModBlaze;
-import tconstruct.modifiers.ModButtertouch;
-import tconstruct.modifiers.ModDurability;
-import tconstruct.modifiers.ModElectric;
-import tconstruct.modifiers.ModExtraModifier;
-import tconstruct.modifiers.ModInteger;
-import tconstruct.modifiers.ModLapis;
-import tconstruct.modifiers.ModPiston;
-import tconstruct.modifiers.ModRedstone;
-import tconstruct.modifiers.ModReinforced;
-import tconstruct.modifiers.ModRepair;
-import tconstruct.modifiers.ModSmite;
-import tconstruct.modifiers.TActiveOmniMod;
-import tconstruct.util.PHConstruct;
-import tconstruct.util.RecipeRemover;
-import tconstruct.util.TDispenserBehaviorSpawnEgg;
-import cpw.mods.fml.common.IFuelHandler;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
+import tconstruct.modifiers.*;
+import tconstruct.util.*;
+
+import net.minecraft.block.*;
+import net.minecraft.block.material.*;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.*;
+import net.minecraft.item.crafting.*;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.WeightedRandomChestContent;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraftforge.common.*;
+import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
+import net.minecraftforge.oredict.*;
public class TContent implements IFuelHandler
{
@@ -2143,6 +1975,13 @@ public class TContent implements IFuelHandler
{
System.out.println("[TConstruct] Thaumcraft not detected.");
}
+
+ if(Loader.isModLoaded("Natura")){
+ try{
+ Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent");
+ TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item)plantItem, 1, 7), new ItemStack(bowstring, 1, 2), 1.2F, 0.8F, 1.3f);
+ }catch(Exception e){} //No need to handle
+ }
ItemStack ingotcast = new ItemStack(metalPattern, 1, 0);
LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting();
diff --git a/tconstruct/items/Bowstring.java b/tconstruct/items/Bowstring.java
index d43e1ec6..bab04b75 100644
--- a/tconstruct/items/Bowstring.java
+++ b/tconstruct/items/Bowstring.java
@@ -2,11 +2,14 @@ package tconstruct.items;
import java.util.List;
+import cpw.mods.fml.common.Loader;
+
import tconstruct.common.TContent;
import tconstruct.library.util.IToolPart;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
public class Bowstring extends CraftingItem implements IToolPart
{
@@ -30,9 +33,9 @@ public class Bowstring extends CraftingItem implements IToolPart
return names;
}
- public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric" };
+ public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric", "flamestring" };
- public static final String[] toolTextureNames = new String[] { "string", "magicfabric" };
+ public static final String[] toolTextureNames = new String[] { "string", "magicfabric", "flamestring" };
@Override
public int getMaterialID (ItemStack stack)
@@ -45,5 +48,7 @@ public class Bowstring extends CraftingItem implements IToolPart
list.add(new ItemStack(id, 1, 0));
if (TContent.thaumcraftAvailable)
list.add(new ItemStack(id, 1, 1));
+ if (Loader.isModLoaded("Natura"))
+ list.add(new ItemStack(id, 1, 2));
}
}