diff --git a/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf b/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf index b2ca3b26..9de2a1db 100644 Binary files a/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf and b/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/_crossbow_2.xcf b/resources/assets/tinker/textures/items/crossbow/_crossbow_2.xcf index bccdb71b..4aedfb9e 100644 Binary files a/resources/assets/tinker/textures/items/crossbow/_crossbow_2.xcf and b/resources/assets/tinker/textures/items/crossbow/_crossbow_2.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf b/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf index 2c9b2cc8..2f7782ff 100644 Binary files a/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf and b/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/beheading_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/beheading_crossbow_effect.png new file mode 100644 index 00000000..18b16506 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/beheading_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/complete.xcf b/resources/assets/tinker/textures/items/crossbow/complete.xcf new file mode 100644 index 00000000..0c5e75b3 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/complete.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/complete_1.xcf b/resources/assets/tinker/textures/items/crossbow/complete_1.xcf new file mode 100644 index 00000000..58524bc7 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/complete_1.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/complete_2.xcf b/resources/assets/tinker/textures/items/crossbow/complete_2.xcf new file mode 100644 index 00000000..abb57094 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/complete_2.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/complete_3.xcf b/resources/assets/tinker/textures/items/crossbow/complete_3.xcf new file mode 100644 index 00000000..3517fb2e Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/complete_3.xcf differ diff --git a/resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png new file mode 100644 index 00000000..6da1a0de Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png new file mode 100644 index 00000000..7e1af109 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png new file mode 100644 index 00000000..84376d9d Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_2.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_2.png new file mode 100644 index 00000000..2c8dc2b5 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_2.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png new file mode 100644 index 00000000..7a086ec5 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/flux_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/flux_crossbow_effect.png new file mode 100644 index 00000000..4d258a7b Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/flux_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png new file mode 100644 index 00000000..478f04a0 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/lava_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/lava_crossbow_effect.png new file mode 100644 index 00000000..2ff8e39e Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/lava_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png new file mode 100644 index 00000000..9edc57e5 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/piston_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/piston_crossbow_effect.png new file mode 100644 index 00000000..5d48bb5a Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/piston_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png new file mode 100644 index 00000000..6ab7c238 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png new file mode 100644 index 00000000..9dd3776f Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png new file mode 100644 index 00000000..898f4021 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png new file mode 100644 index 00000000..dc9f5b7b Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png new file mode 100644 index 00000000..ebff98e7 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png new file mode 100644 index 00000000..e36d6979 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png new file mode 100644 index 00000000..5d6b61d0 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png new file mode 100644 index 00000000..a34f368a Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/reinforced_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/reinforced_crossbow_effect.png new file mode 100644 index 00000000..e722b760 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/reinforced_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/silk_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/silk_crossbow_effect.png new file mode 100644 index 00000000..2b3faf1c Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/silk_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/smite_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/smite_crossbow_effect.png new file mode 100644 index 00000000..12722c50 Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/smite_crossbow_effect.png differ diff --git a/resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png new file mode 100644 index 00000000..66bb964c Binary files /dev/null and b/resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png differ diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 3be1d427..e8a69cad 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -2,6 +2,9 @@ package tconstruct.modifiers.tools; 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 class ModFlux extends ModBoolean { 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) diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 3a137f76..b726d3fa 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -301,13 +301,15 @@ public class Crossbow extends ProjectileWeapon { @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 @@ public class Crossbow extends ProjectileWeapon { 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) diff --git a/weaponry.txt b/weaponry.txt index 9e656d4e..2ea661e6 100644 --- a/weaponry.txt +++ b/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?