Merge branch 'experimental'

build.gradle

@@ -67,6 +67,7 @@ dependencies {
     compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
     compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
     compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev"
+    compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.fmp_version}:dev"
     //compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
     deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
 }

build.properties

@@ -4,5 +4,6 @@ mantle_version=0.3.1.jenkins176
 CCLIB_version=1.1.1.99
 NEI_version=1.0.3.66
 ccc_version=1.0.4.29
-mod_version=1.7.1
-waila_version=1.5.3_1.7.10
+mod_version=1.7.experimental
+waila_version=1.5.3_1.7.10
+fmp_version=1.1.0.314

resources/assets/tinker/lang/en_US.lang

@@ -192,6 +192,10 @@ item.tconstruct.Pattern.fullguard.name=Full Guard Pattern
 item.tconstruct.Pattern.bowstring.name=Bowstring Pattern
 item.tconstruct.Pattern.fletching.name=Fletching Pattern
 item.tconstruct.Pattern.arrowhead.name=Arrowhead Pattern
+item.tconstruct.Pattern.shuriken.name=Shuriken Pattern
+item.tconstruct.Pattern.crossbowlimb.name=Crossbow Limb Pattern
+item.tconstruct.Pattern.crossbowbody.name=Crossbow Body Pattern
+item.tconstruct.Pattern.bowlimb.name=Bow Limb Pattern
 
 item.tconstruct.Pattern.blank_cast.name=Blank Cast
 item.tconstruct.MetalPattern.rod.name=Tool Rod Cast
@@ -222,6 +226,10 @@ item.tconstruct.MetalPattern.arrowhead.name=Arrowhead Cast
 item.tconstruct.MetalPattern.ingot.name=Ingot Cast
 item.tconstruct.MetalPattern.gem.name=Gem Cast
 item.tconstruct.MetalPattern.nugget.name=Nugget Cast
+item.tconstruct.MetalPattern.shuriken.name=Shuriken Cast
+item.tconstruct.MetalPattern.crossbowlimb.name=Crossbow Limb Cast
+item.tconstruct.MetalPattern.crossbowbody.name=Crossbow Body Cast
+item.tconstruct.MetalPattern.bowlimb.name=Bow Limb Cast
 
 item.tconstruct.Materials.PaperStack.name=Paper Stack
 item.tconstruct.Materials.SlimeCrystal.name=Slime Crystal
@@ -418,11 +426,13 @@ item.tconstruct.Fletching.feather.name=Feather Fletching
 item.tconstruct.Fletching.leaf.name=Leaf Fletching
 item.tconstruct.Fletching.slime.name=Slime Fletching
 item.tconstruct.Fletching.blueslime.name=Slime Fletching
+item.tconstruct.Fletching.slimeleaf.name=Slimeleaf Fletching
 
 item.tconstruct.manual.beginner.name=Materials and You: Volume 1
 item.tconstruct.manual.toolstation.name=Materials and You: Volume 2
 item.tconstruct.manual.smeltery.name=Mighty Smelting
 item.tconstruct.manual.diary.name=Diary of a Tinker
+item.tconstruct.manual.weaponry.name=Tinkers' Weaponry
 
 item.tconstruct.bucket.Iron.name=Molten Iron Bucket
 item.tconstruct.bucket.Gold.name=Molten Gold Bucket
@@ -571,6 +581,11 @@ toolpart.HammerHead=%%material Hammer Head
 toolpart.Bowstring=%%material Bowstring
 toolpart.ArrowHead=%%material Arrowhead
 toolpart.Fletching=%%material Fletching
+toolpart.Shuriken=%%material Shuriken
+toolpart.CrossbowLimb=%%material Crossbow Limb
+toolpart.CrossbowBody=%%material Crossbow Body
+toolpart.BowLimb=%%material Bow Limb
+toolpart.Bolt=%%material Bolt
 
 # Now with translations of specific material and part combinations:
 #toolpart.ToolRod.wood=Wooden Tool Rod
@@ -711,6 +726,7 @@ tconstruct.waila.subtanks=Subtanks:
 tconstruct.waila.invalidstructure=Invalid structure
 
 tconstruct.nei.toolmaterials=Tool Materials
+tconstruct.nei.projectilematerials=Bow & Arrow
 tconstruct.nei.alloying=Smeltery Alloying
 tconstruct.nei.castingbasin=Casting Basin
 tconstruct.nei.castingtable=Casting Table
@@ -749,7 +765,7 @@ gui.toolstation6=Draw Speed:
 gui.toolstation7=Arrow Speed: 
 gui.toolstation8=Weight: 
 gui.toolstation9=Accuracy: 
-gui.toolstation10=Base Attack:
+gui.toolstation10=Base Damage:
 gui.toolstation11=Shortbow Attack:
 gui.toolstation12=Mining Speeds: 
 gui.toolstation13=Harvest Levels:
@@ -758,8 +774,11 @@ gui.toolstation15=Mining Level:
 gui.toolstation16=Usage Speed: 
 gui.toolstation17=Modifiers
 gui.toolstation18=Modifiers remaining: 
-gui.toolstation19=Damage Reduction: 
-gui.toolstation20=Protection: 
+gui.toolstation19=Damage Reduction:
+gui.toolstation20=Protection:
+gui.toolstation21=Ammo:
+gui.toolstation22=Break Chance:
+gui.toolstation23=Max. Attack:
 
 gui.mining1=Stone
 gui.mining2=Iron
@@ -779,15 +798,23 @@ gui.toolstation.dagger.desc=The Dagger is a short blade that can be thrown.\n\nS
 gui.toolstation.fryingpan.desc=The Frying Pan is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle
 gui.toolstation.battlesign.desc=The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability:\nDamage Reflector\n\nNatural Ability: Writable\n\nDamage: Low\nDurability: Average
 gui.toolstation.chisel.desc=The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle
-gui.toolstation.shortbow.desc=The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod
-gui.toolstation.arrow.desc=Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching
 gui.toolstation.hammer.desc=The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High
 gui.toolstation.lumberaxe.desc=The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average
 gui.toolstation.excavator.desc=The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average
 gui.toolstation.scythe.desc=The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE
 gui.toolstation.cleaver.desc=The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average
 gui.toolstation.battleaxe.desc=The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average
 
+gui.toolstation.shortbow.desc=The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Bow Limb\n- Bowstring\n- Bow Limb
+gui.toolstation.longbow.desc=The Longbow is a ranged weapon. It has greater range than a shortbow and is able to shoot heavier arrows, but performs worse with light arrows.\n\n Required parts:\n- Bow Limb\n- Bowstring\n- Bow Limb\n- Large Plate
+gui.toolstation.arrowammo.desc=Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching
+gui.toolstation.crossbow.desc=The crossbow is a precise ranged weapon. It loads bolts, that are fired on trigger.\n\nSpecial Ability:\n- Reduced reload time with harder materials
+gui.toolstation.boltammo.desc=Bolts are projectiles fired from Crossbows.\n\nRequired Parts:\n- Bolt Core\n- Fletching\n\nBolt cores are obtained by pouring metal over a tool rod in a Casting Table.
+gui.toolstation.throwingknife.desc=Mid ranged throwing weapon. Hold to take aim, release to throw.\n\nDamage: Medium\nCapacity: Medium
+gui.toolstation.shuriken.desc=Short ranged throwing weapon. Thrown instantly.\n\nDamage: Low\nCapacity: High
+gui.toolstation.javelin.desc=Ranged Melee weapon hybrid. Potent as a melee weapon, devasting at range.\n\nDamage: High\nCapacity: Low
+
+
 material.wood=Wood
 material.wood.display=Wooden
 material.stone=Stone
@@ -856,7 +883,8 @@ modifier.tool.beheading=Beheading
 
 creativeModLock.tooltip=Target Lock: 
 
-attribute.name.ammo.attackDamage=Average Shot Damage
+attribute.name.ammo.attackDamage=Base Damage
+attribute.name.ammo.maxAttackDamage=Max. Damage
 
 tool.pickaxe=Pickaxe
 tool.shovel=Shovel
@@ -877,7 +905,13 @@ tool.excavator=Excavator
 tool.hammer=Hammer
 tool.battleaxe=Battleaxe
 tool.shortbow=Shortbow
-tool.arrow=Arrow
+tool.longbow=Longbow
+tool.crossbow=Crossbow
+tool.arrowammo=Arrows
+tool.boltammo=Bolts
+tool.shuriken=Shuriken
+tool.throwingknife=Throwing Knife
+tool.javelin=Javelin
 
 # Customization of default tool names based on tool and material
 #tool.shovel.wood=Wooden Shovel

resources/assets/tinker/manuals/en_US/weaponry.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+
+<book>
+<page type="intro">
+<text>Tinkers' Weaponry
+Brings the hurt whole new places
+
+By Sheriff Bownana</text>
+</page>
+
+<page type="contents">
+<text>Table of Contents</text>
+<link>
+ <text>Introduction</text>
+ <icon>weaponrybook</icon>
+ <jump>3</jump>
+</link>
+<link>
+ <text>Throwing Weapons</text>
+ <icon>throwingknifeIcon</icon>
+ <jump>5</jump>
+</link>
+<link>
+ <text>Projectile Weapons</text>
+ <icon>shortbowIcon</icon>
+ <jump>7</jump>
+</link>
+<link>
+ <text>Projectiles</text>
+ <icon>arrowIcon</icon>
+ <jump>10</jump>
+</link>
+</page>
+
+<page type="text">
+<text>Why walk up to hit stuff, when you can do that while standing here!
+
+A tinkerer knows how to create varied ranged weapons. There are two big categories: Thrown weapons and weapons that shoot projectiles.
+
+Both types utilize an ammo system. Instead of having several items, these ranged weapons consist of one item that contains many of it. Why carry around 2 stacks of arrows, when you can have 200 in one stack!
+These Ammo-Items don't have a durability, but use up their ammo for each projectile thrown/shot.</text>
+</page>
+
+<page type="text">
+<text>Throwing Weapons:
+* Throwing Knife
+* Shuriken
+* Javelin
+
+Projectile Weapons:
+* Shortbow
+* Longbow
+* Crossbow
+
+Projectiles:
+* Arrows
+* Bolts</text>
+</page>
+
+<page type="text">
+<text>Throwing Weapons
+
+Throwing Knifes:
+These knifes are crafted from a knife blade and a handle.
+Hold rightclick to take aim, and release it to throw a knife.
+Throwing knifes stack up to a moderate amount, and deal moderate damage.
+
+Shuriken:
+Small delicate projectiles put together from 4 parts, that are thrown from the wrist. Because of this you don't need to take aim and can throw them directly.
+Since they're so small you can carry many of them, however they don't deal much damage.</text>
+</page>
+
+<page type="text">
+<text>
+
+Javelin:
+This is a hybrid between a melee and a ranged weapon, consisting of an arrow head on two tough tool rods. It deals moderate damage as a melee weapon, but to unleash its true potential you have to throw it at your enemy.
+The throwing has a small windup. Because of their size you can only carry a few, but they pack a punch.</text>
+</page>
+
+<page type="text">
+<text>Projectile Weapons
+
+Shortbow:
+Put together from two bow limbs and a bowstring, this weapon is a fast and handy bow. Keep in mind that inflexible materials like stone can hardly be drawn back and can't accelerate projectiles well. Organic materials are favoured for quick bows, while metals require lots of strengt to draw back, but provide more power.
+The bow requires arrows as ammo.
+Offensive modifiers on bows do not count for arrows. The only modifiers affecting its ranged performance are Redstone and lapis.</text>
+</page>
+
+<page type="text">
+<text>
+
+Longbow:
+The big brother. This bow is much bigger, requiring more time to pull it back, but boy oh boy are those arrows fast.
+Because of this the longbow performs slightly better against armored targets. Furthermore this makes the longbow less accurate with very light arrows.
+The longbow is constructed from two bow limbs, a bowstring and a large plate.</text>
+</page>
+
+<page type="text">
+<text>
+
+Crossbow:
+Those pesky metals are such a pain to pull back. Luckily a tinkerer knows how to help himself! The crossbow allows you to pre-load it with a bolt, and have it ready instantly to fire. Since this allows for much more power, it can shoot heavier projectiles, resulting in more damage and armor penetration.
+To load a crossbow simply rightclick and wait until the animation is done. The loading process can be stopped by pressing rightclick while sneaking. The crossbow can be unloaded in the same way.</text>
+</page>
+
+<page type="text">
+<text>Projectiles
+For these projectiles goes: The heavier the projectile, the more damage carries through armor.
+
+Arrows:
+The bread and butter of every ranger. Arrows can be built from many different materials. It needs an arrow head, a shaft and a fletching.
+The choice of materials allows a balance between damage, arrow-count, accuracy and fragility. The head material is crucial for its weight.
+A fragile arrow has a chance to break on impact with terrain. Arrows always break when they hit a target, however the reinforced trait gives a chance for the arrow to survive the impact.</text>
+</page>
+
+<page type="text">
+<text>
+
+Valid Shaft Materials:
+* Stick
+* Sugarcane
+* Bone
+* Blaze Rod
+
+Valid Fletching Materials:
+* Leaves
+* Slimeleaves
+* Feathers
+* Slime</text>
+</page>
+
+<page type="text">
+<text>
+
+Bolts:
+Crafting bolts is a delicate process. First you need a core in the form of a tool rod.
+Take this tool rod to a smeltery and put it into a Casting Table. Pour some metal onto it to coat the tip with a more damaging material.
+After this process, add a fletching and your bolts are ready to be used.
+
+Since the bolts consist of a harder core and tip they carry more weight than regular arrows, making them perfect to fight armored targets.</text>
+</page>
+
+</book>

resources/assets/tinker/sounds.json

@@ -16,5 +16,29 @@
      "sounds": [
        "launcher_clank"
      ]
+   },
+   "woodHit": {
+     "category": "block",
+     "sounds": [
+       "woodHit1",
+	   "woodHit2",
+	   "woodHit3",
+	   "woodHit4",
+	   "woodHit5"
+     ]
+   },
+   "stoneHit": {
+     "category": "block",
+     "sounds": [
+       "stoneHit1",
+	   "stoneHit2",
+	   "stoneHit3"
+     ]
+   },
+   "crossbowReload": {
+	"category": "neutral",
+	"sounds": [
+		"crossbowReload"
+	]
    }
 }

resources/assets/tinker/sounds/Credits.txt

@@ -0,0 +1,9 @@
+Stone-Hit:
+Pickaxe mining stone by ryanconway
+https://www.freesound.org/people/ryanconway/sounds/240801/
+metal falling on stone by p3n10
+https://www.freesound.org/people/p3n10/sounds/171294/
+
+Wood-Hit:
+Hitting Wood by altfuture
+https://www.freesound.org/people/altfuture/sounds/174633/