Crossbow Modifier Graphics \o/

src/main/java/tconstruct/modifiers/tools/ModFlux.java

@@ -2,6 +2,9 @@
 
 import cofh.api.energy.IEnergyContainerItem;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import tconstruct.library.tools.ToolCore;
@@ -23,6 +26,12 @@ public boolean matches (ItemStack[] input, ItemStack tool)
     {
         NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
+        // not on ammo weapons, since they don't have durability technically
+        String[] traits = ((ToolCore)tool.getItem()).getTraits();
+        for(String trait : traits)
+            if("ammo".equals(trait))
+                return false;
+
         ItemStack foundBattery = null;
         // try to find the battery in the input
         for (ItemStack stack : input)

src/main/java/tconstruct/weaponry/weapons/Crossbow.java

@@ -301,13 +301,15 @@ public void playFiringSound(World world, EntityPlayer player, ItemStack weapon,
 
     @Override
     public IIcon getIcon(ItemStack stack, int renderPass) {
-        if(!animateLayer(renderPass))
+        if(!animateLayer(renderPass) && renderPass < getPartAmount())
             return super.getIcon(stack, renderPass);
 
         if(!stack.hasTagCompound())
             return super.getIcon(stack, renderPass);
 
         NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+        if(tags == null || renderPass > 10)
+            return super.getIcon(stack, renderPass);
 
         float progress;
 
@@ -318,10 +320,20 @@ else if(!tags.hasKey("Reloading"))
         else
             progress = getWindupProgress(stack, getWindupTime(stack) - tags.getInteger("Reloading"));
 
-        // effects aren't animated
-        // todo: make effects animated
-        if(renderPass >= getPartAmount())
+        // are we drawing an effect?
+        if(renderPass >= getPartAmount()) {
+            // is the effect animated?
+            String effect = "Effect" + (1 + renderPass - getPartAmount());
+            if(tags.hasKey(effect)) {
+                int index = tags.getInteger(effect);
+                if(animationEffectIcons.get(index) != null)
+                    return getCorrectAnimationIcon(animationEffectIcons, index, progress);
+                else
+                    // non-animated
+                    return effectIcons.get(index);
+            }
             return super.getIcon(stack, renderPass);
+        }
 
         // get the correct icon
         switch (renderPass)

weaponry.txt

@@ -7,6 +7,8 @@ TODO:
 * Partbuilder stuff for weaponry stuff?
 * Bring bowmaterial stats etc in line?
 * Can't have flux or redstone or moss on ammo tools
+* Knockback on projectiles knocks towards their moving direction
+* Glassmakers Arrows :D
 
 maybe give javelins slight armor piercing? or do they have that already?