diff --git a/mods/tinker/resources/lang/en_US.xml b/mods/tinker/resources/lang/en_US.xml index b936f64d..0dacbadb 100644 --- a/mods/tinker/resources/lang/en_US.xml +++ b/mods/tinker/resources/lang/en_US.xml @@ -158,11 +158,15 @@ Block of Alumite Block of Steel + Torch + Clear Glass Soul Glass Clear Soul Glass - Torch + Clear Pane + Soul Pane + Clear Soul Pane White Stained Glass Orange Stained Glass @@ -181,6 +185,23 @@ Red Stained Glass Black Stained Glass + White Stained Pane + Orange Stained Pane + Magenta Stained Pane + Light Blue Stained Pane + Yellow Stained Pane + Lime Stained Pane + Pink Stained Pane + Gray Stained Pane + Light Gray Stained Pane + Cyan Stained Pane + Purple Stained Pane + Blue Stained Pane + Brown Stained Pane + Green Stained Pane + Red Stained Pane + Black Stained Pane + Knapsack Blank Pattern Blank Cast @@ -207,6 +228,9 @@ Liquified Emerald Bucket Bucket o' Blood + Bowstring + Enchanted Bowstring + Molten Iron Molten Gold Molten Copper diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index b0971557..b0ae4839 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.9", dependencies = "required-after:Forge@[7.7.1.675,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.4.dev.12", dependencies = "required-after:Forge@[7.7.1.675,)") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.util.network.TPacketHandler.class) public class TConstruct { @@ -58,9 +58,9 @@ public class TConstruct } @PreInit - public void preInit (FMLPreInitializationEvent evt) + public void preInit (FMLPreInitializationEvent event) { - PHConstruct.initProps(); + PHConstruct.initProps(event.getModConfigurationDirectory()); TConstructRegistry.materialTab = new TabTools("TConstructMaterials"); TConstructRegistry.toolTab = new TabTools("TConstructTools"); TConstructRegistry.blockTab = new TabTools("TConstructBlocks"); diff --git a/mods/tinker/tconstruct/blocks/GlassPane.java b/mods/tinker/tconstruct/blocks/GlassPane.java new file mode 100644 index 00000000..1fdbc15e --- /dev/null +++ b/mods/tinker/tconstruct/blocks/GlassPane.java @@ -0,0 +1,25 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; + +import mods.tinker.tconstruct.library.TConstructRegistry; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class GlassPane extends PaneBase +{ + static String blockTextures[] = { "glass_clear", "soulglass", "soulglass_clear" }; + public GlassPane(int id) + { + super(id, Material.glass, "glass/", blockTextures); + this.setHardness(0.3F); + this.setStepSound(soundGlassFootstep); + this.setUnlocalizedName("tconstruct.glasspane"); + this.setCreativeTab(TConstructRegistry.blockTab); + } +} diff --git a/mods/tinker/tconstruct/blocks/GlassPaneStained.java b/mods/tinker/tconstruct/blocks/GlassPaneStained.java new file mode 100644 index 00000000..c83810c5 --- /dev/null +++ b/mods/tinker/tconstruct/blocks/GlassPaneStained.java @@ -0,0 +1,42 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; + +import mods.tinker.tconstruct.library.TConstructRegistry; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class GlassPaneStained extends PaneBase +{ + static String blockTextures[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", + "purple", "blue", "brown", "green", "red", "black" }; + public GlassPaneStained(int id) + { + super(id, Material.glass, "glass/", assembleBlockTextures()); + this.setHardness(0.3F); + this.setStepSound(soundGlassFootstep); + this.setUnlocalizedName("tconstruct.glasspanestained"); + this.setCreativeTab(TConstructRegistry.blockTab); + } + + private static String[] assembleBlockTextures () + { + String[] textures = new String[blockTextures.length]; + for (int i = 0; i < blockTextures.length; i++) + { + textures[i] = "stainedglass_"+blockTextures[i]; + } + return textures; + } + + @Override + public int getRenderBlockPass () + { + return 1; + } +} diff --git a/mods/tinker/tconstruct/blocks/PaneBase.java b/mods/tinker/tconstruct/blocks/PaneBase.java new file mode 100644 index 00000000..2b59f7ed --- /dev/null +++ b/mods/tinker/tconstruct/blocks/PaneBase.java @@ -0,0 +1,186 @@ +package mods.tinker.tconstruct.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import mods.tinker.tconstruct.client.block.PaneRender; +import net.minecraft.block.Block; +import net.minecraft.block.BlockPane; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class PaneBase extends Block +{ + public String[] textureNames; + public String folder; + public Icon[] icons; + public Icon[] sideIcons; + public PaneBase(int id, Material material, String folder, String[] blockTextures) + { + super(id, material); + textureNames = blockTextures; + this.folder = folder; + } + + public boolean canConnectTo (int blockID) + { + Block block = Block.blocksList[blockID]; + return Block.opaqueCubeLookup[blockID] || block instanceof PaneBase || block instanceof BlockPane || blockID == Block.glass.blockID; + } + + public Icon getSideTextureIndex (int meta) + { + return sideIcons[meta]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + this.sideIcons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]); + this.sideIcons[i] = iconRegister.registerIcon("tinker:"+folder+textureNames[i]+"_side"); + } + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + return icons[meta]; + } + + @Override + public void getSubBlocks(int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < textureNames.length; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } + + public boolean isOpaqueCube() + { + return false; + } + + public boolean renderAsNormalBlock() + { + return false; + } + + public int getRenderType() + { + return PaneRender.model; + } + + public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) + { + int bID = iblockaccess.getBlockId(i, j, k); + if (Block.blocksList[bID] instanceof PaneBase || Block.blocksList[bID] instanceof BlockPane) + { + return false; + } + else + { + return super.shouldSideBeRendered(iblockaccess, i, j, k, l); + } + } + + @Override + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) + { + boolean south = canConnectTo(world.getBlockId(x, y, z - 1)); + boolean north = canConnectTo(world.getBlockId(x, y, z + 1)); + boolean east = canConnectTo(world.getBlockId(x - 1, y, z)); + boolean west = canConnectTo(world.getBlockId(x + 1, y, z)); + if (east && west || !east && !west && !south && !north) + { + setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + else if (east && !west) + { + setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + else if (!east && west) + { + setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + if (south && north || !east && !west && !south && !north) + { + setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + else if (south && !north) + { + setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + else if (!south && north) + { + setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); + } + } + + public void setBlockBoundsForItemRender() + { + setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + public void setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int i, int j, int k) + { + float f = 0.4375F; + float f1 = 0.5625F; + float f2 = 0.4375F; + float f3 = 0.5625F; + boolean flag = canConnectTo(iblockaccess.getBlockId(i, j, k - 1)); + boolean flag1 = canConnectTo(iblockaccess.getBlockId(i, j, k + 1)); + boolean flag2 = canConnectTo(iblockaccess.getBlockId(i - 1, j, k)); + boolean flag3 = canConnectTo(iblockaccess.getBlockId(i + 1, j, k)); + if (flag2 && flag3 || !flag2 && !flag3 && !flag && !flag1) + { + f = 0.0F; + f1 = 1.0F; + } + else if (flag2 && !flag3) + { + f = 0.0F; + } + else if (!flag2 && flag3) + { + f1 = 1.0F; + } + if (flag && flag1 || !flag2 && !flag3 && !flag && !flag1) + { + f2 = 0.0F; + f3 = 1.0F; + } + else if (flag && !flag1) + { + f2 = 0.0F; + } + else if (!flag && flag1) + { + f3 = 1.0F; + } + setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); + } + +} diff --git a/mods/tinker/tconstruct/client/CustomBowRenderer.java b/mods/tinker/tconstruct/client/CustomBowRenderer.java new file mode 100644 index 00000000..2faa1bce --- /dev/null +++ b/mods/tinker/tconstruct/client/CustomBowRenderer.java @@ -0,0 +1,150 @@ +package mods.tinker.tconstruct.client; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +public class CustomBowRenderer implements IItemRenderer +{ + Minecraft mc = Minecraft.getMinecraft(); + private RenderBlocks renderBlocksInstance = new RenderBlocks(); + + @Override + public boolean handleRenderType (ItemStack item, ItemRenderType type) + { + return type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON; + } + + @Override + public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) + { + return true; + } + + @Override + public void renderItem (ItemRenderType type, ItemStack item, Object... data) + { + EntityLiving living = (EntityLiving) data[1]; + ItemRenderer renderer = RenderManager.instance.itemRenderer; + for (int i = 0; i < item.getItem().getRenderPasses(item.getItemDamage())+1; i++) + renderItem(living, item, i, type); + } + + public void renderItem (EntityLiving living, ItemStack stack, int renderPass, ItemRenderType type) + { + GL11.glPushMatrix(); + + Block block = null; + if (stack.getItem() instanceof ItemBlock && stack.itemID < Block.blocksList.length) + { + block = Block.blocksList[stack.itemID]; + } + + Icon icon = living.getItemIcon(stack, renderPass); + if (living instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer)living; + if (player.itemInUse != null) + icon = stack.getItem().getIcon(stack, renderPass, player, player.itemInUse, player.getItemInUseCount()); + } + + if (icon == null) + { + GL11.glPopMatrix(); + return; + } + + if (stack.getItemSpriteNumber() == 0) + { + this.mc.renderEngine.bindTexture("/terrain.png"); + } + else + { + this.mc.renderEngine.bindTexture("/gui/items.png"); + } + + if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) + { + GL11.glTranslatef(0.6F, 0.5F, 0.5F); + } + else + { + GL11.glRotatef(180.0F, 0F, 0F, 1.0F); + GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.75F); + GL11.glTranslatef(-0.6F, -0.25F, 1.0F); + //GL11.glRotatef(-90.0F, 0F, 1.0F, -1.0F); + + //GL11.glRotatef(90.0F, 0F, 1.0F, 1.0F); + //GL11.glRotatef(90.0F, 1.0F, 0F, 1.0F); + //GL11.glRotatef(90.0F, 0F, 1.0F, 0.5F); + + //GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); + //GL11.glRotatef(59.0F, 0.0F, 0.0F, 1.0F); + GL11.glScalef(1.75F, 1.75F, 1.75F); + } + + Tessellator tessellator = Tessellator.instance; + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); + float f4 = 0.0F; + float f5 = 0.3F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glTranslatef(-f4, -f5, 0.0F); + float f6 = 1.5F; + GL11.glScalef(f6, f6, f6); + GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); + ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, icon.getSheetWidth(), icon.getSheetHeight(), 0.0625F); + + if (stack != null && stack.hasEffect() && renderPass == 0) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + this.mc.renderEngine.bindTexture("%blur%/misc/glint.png"); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float f7 = 0.76F; + GL11.glColor4f(0.5F * f7, 0.25F * f7, 0.8F * f7, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float f8 = 0.125F; + GL11.glScalef(f8, f8, f8); + float f9 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(f9, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(f8, f8, f8); + f9 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-f9, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPopMatrix(); + } + +} diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index fe1e9d89..61ddd73f 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -10,88 +10,20 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic; -import mods.tinker.tconstruct.blocks.logic.CastingTableLogic; -import mods.tinker.tconstruct.blocks.logic.DrawbridgeLogic; -import mods.tinker.tconstruct.blocks.logic.DryingRackLogic; -import mods.tinker.tconstruct.blocks.logic.FrypanLogic; -import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator; -import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; -import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; -import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; -import mods.tinker.tconstruct.blocks.logic.StencilTableLogic; -import mods.tinker.tconstruct.blocks.logic.ToolForgeLogic; -import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; -import mods.tinker.tconstruct.client.block.BarricadeRender; -import mods.tinker.tconstruct.client.block.CastingBasinSpecialRender; -import mods.tinker.tconstruct.client.block.CastingTableSpecialRenderer; -import mods.tinker.tconstruct.client.block.CrystalBlockRender; -import mods.tinker.tconstruct.client.block.DryingRackRender; -import mods.tinker.tconstruct.client.block.DryingRackSpecialRender; -import mods.tinker.tconstruct.client.block.FluidRender; -import mods.tinker.tconstruct.client.block.FrypanRender; -import mods.tinker.tconstruct.client.block.GolemCoreRender; -import mods.tinker.tconstruct.client.block.MachineRender; -import mods.tinker.tconstruct.client.block.OreberryRender; -import mods.tinker.tconstruct.client.block.SearedRender; -import mods.tinker.tconstruct.client.block.SmallFontRenderer; -import mods.tinker.tconstruct.client.block.SmelteryRender; -import mods.tinker.tconstruct.client.block.TableForgeRender; -import mods.tinker.tconstruct.client.block.TableRender; -import mods.tinker.tconstruct.client.block.TankRender; -import mods.tinker.tconstruct.client.entity.CartRender; -import mods.tinker.tconstruct.client.entity.CloneHeadModel; -import mods.tinker.tconstruct.client.entity.CrystalGuardianRender; -import mods.tinker.tconstruct.client.entity.CrystalRender; -import mods.tinker.tconstruct.client.entity.FancyItemRender; -import mods.tinker.tconstruct.client.entity.SlimeCloneRender; -import mods.tinker.tconstruct.client.entity.SlimeRender; -import mods.tinker.tconstruct.client.entity.projectile.DaggerRender; -import mods.tinker.tconstruct.client.entity.projectile.LaunchedItemRender; -import mods.tinker.tconstruct.client.gui.ArmorExtendedGui; -import mods.tinker.tconstruct.client.gui.DrawbridgeGui; -import mods.tinker.tconstruct.client.gui.FrypanGui; -import mods.tinker.tconstruct.client.gui.GlowstoneAggregatorGui; -import mods.tinker.tconstruct.client.gui.GuiManual; -import mods.tinker.tconstruct.client.gui.InventoryTab; -import mods.tinker.tconstruct.client.gui.KnapsackGui; -import mods.tinker.tconstruct.client.gui.PartCrafterGui; -import mods.tinker.tconstruct.client.gui.PatternChestGui; -import mods.tinker.tconstruct.client.gui.SmelteryGui; -import mods.tinker.tconstruct.client.gui.StencilTableGui; -import mods.tinker.tconstruct.client.gui.ToolForgeGui; -import mods.tinker.tconstruct.client.gui.ToolStationGui; -import mods.tinker.tconstruct.client.pages.BlankPage; -import mods.tinker.tconstruct.client.pages.BlockCastPage; -import mods.tinker.tconstruct.client.pages.BookPage; -import mods.tinker.tconstruct.client.pages.ContentsTablePage; -import mods.tinker.tconstruct.client.pages.CraftingPage; -import mods.tinker.tconstruct.client.pages.FurnacePage; -import mods.tinker.tconstruct.client.pages.MaterialPage; -import mods.tinker.tconstruct.client.pages.ModifierPage; -import mods.tinker.tconstruct.client.pages.PicturePage; -import mods.tinker.tconstruct.client.pages.SectionPage; -import mods.tinker.tconstruct.client.pages.SidebarPage; -import mods.tinker.tconstruct.client.pages.TextPage; -import mods.tinker.tconstruct.client.pages.TitlePage; -import mods.tinker.tconstruct.client.pages.ToolPage; -import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.common.TProxyCommon; -import mods.tinker.tconstruct.entity.Automaton; -import mods.tinker.tconstruct.entity.BlueSlime; -import mods.tinker.tconstruct.entity.CartEntity; -import mods.tinker.tconstruct.entity.Crystal; -import mods.tinker.tconstruct.entity.FancyEntityItem; -import mods.tinker.tconstruct.entity.SlimeClone; -import mods.tinker.tconstruct.entity.projectile.DaggerEntity; -import mods.tinker.tconstruct.entity.projectile.LaunchedPotion; -import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.client.TConstructClientRegistry; -import mods.tinker.tconstruct.library.client.ToolGuiElement; -import mods.tinker.tconstruct.library.crafting.ToolBuilder; -import mods.tinker.tconstruct.library.tools.ToolCore; -import mods.tinker.tconstruct.util.player.ArmorExtended; -import mods.tinker.tconstruct.util.player.KnapsackInventory; +import mods.tinker.tconstruct.blocks.logic.*; +import mods.tinker.tconstruct.client.block.*; +import mods.tinker.tconstruct.client.entity.*; +import mods.tinker.tconstruct.client.entity.projectile.*; +import mods.tinker.tconstruct.client.gui.*; +import mods.tinker.tconstruct.client.pages.*; +import mods.tinker.tconstruct.common.*; +import mods.tinker.tconstruct.entity.*; +import mods.tinker.tconstruct.entity.projectile.*; +import mods.tinker.tconstruct.library.*; +import mods.tinker.tconstruct.library.client.*; +import mods.tinker.tconstruct.library.crafting.*; +import mods.tinker.tconstruct.library.tools.*; +import mods.tinker.tconstruct.util.player.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -133,6 +65,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; @@ -340,6 +273,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new CrystalBlockRender()); RenderingRegistry.registerBlockHandler(new MachineRender()); RenderingRegistry.registerBlockHandler(new DryingRackRender()); + RenderingRegistry.registerBlockHandler(new PaneRender()); //RenderingRegistry.registerBlockHandler(new BrickRender()); //RenderingRegistry.registerBlockHandler(new BallRepeaterRender()); @@ -361,6 +295,8 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender()); RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384)); //RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo! + + MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer()); addRenderMappings(); addToolButtons(); @@ -735,6 +671,8 @@ public class TProxyClient extends TProxyCommon addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]); } + addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow", + "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"); addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer", "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"); addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", @@ -764,7 +702,7 @@ public class TProxyClient extends TProxyCommon { String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; - String[] modPartTypes = { "thaumium" }; + //String[] modPartTypes = { "thaumium" }; String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk", "beheading", "smite", "spider", "reinforced" }; int[] universalEffects = { 0, 1, 4, 9, 16 }; @@ -777,10 +715,10 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true); } - for (int iter = 0; iter < modPartTypes.length; iter++) + /*for (int iter = 0; iter < modPartTypes.length; iter++) { TConstructClientRegistry.addMaterialRenderMapping(31 + iter, "tinker", modPartTypes[iter], true); - } + }*/ for (ToolCore tool : TConstructRegistry.getToolMapping()) { @@ -789,6 +727,12 @@ public class TProxyClient extends TProxyCommon TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true); } } + + String[] bowstringTypes = { "string", "magicfabric" }; + for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) + { + TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); + } } /* Keybindings */ diff --git a/mods/tinker/tconstruct/client/block/PaneRender.java b/mods/tinker/tconstruct/client/block/PaneRender.java new file mode 100644 index 00000000..db1268a9 --- /dev/null +++ b/mods/tinker/tconstruct/client/block/PaneRender.java @@ -0,0 +1,394 @@ +package mods.tinker.tconstruct.client.block; + +import mods.tinker.tconstruct.blocks.PaneBase; +import mods.tinker.tconstruct.client.TProxyClient; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class PaneRender implements ISimpleBlockRenderingHandler +{ + public static int model = RenderingRegistry.getNextAvailableRenderId(); + + @Override + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + if (modelID == model) + { + renderer.setRenderBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + TProxyClient.renderStandardInvBlock(renderer, block, metadata); + } + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) + { + if (modelID == model) + { + return renderPaneInWorld(renderer, world, x, y, z, (PaneBase) block); + } + + else + { + return false; + } + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return model; + } + + public static boolean renderPaneInWorld (RenderBlocks renderblocks, IBlockAccess iblockaccess, int x, int y, int z, PaneBase pane) + { + int l = iblockaccess.getHeight(); + Tessellator tessellator = Tessellator.instance; + tessellator.setBrightness(pane.getMixedBrightnessForBlock(iblockaccess, x, y, z)); + float f = 1.0F; + int i1 = pane.colorMultiplier(iblockaccess, x, y, z); + float f1 = (float) (i1 >> 16 & 0xff) / 255F; + float f2 = (float) (i1 >> 8 & 0xff) / 255F; + float f3 = (float) (i1 & 0xff) / 255F; + if (EntityRenderer.anaglyphEnable) + { + float f4 = (f1 * 30F + f2 * 59F + f3 * 11F) / 100F; + float f5 = (f1 * 30F + f2 * 70F) / 100F; + float f6 = (f1 * 30F + f3 * 70F) / 100F; + f1 = f4; + f2 = f5; + f3 = f6; + } + tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); + boolean flag = false; + boolean flag1 = false; + Icon icon; + Icon icon1; + int meta = iblockaccess.getBlockMetadata(x, y, z); + icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta); + icon1 = pane.getSideTextureIndex(meta); + + meta = icon.getOriginX(); + int k1 = icon.getOriginY(); + double d = (double)icon.getMinU(); + double d1 = (double)icon.getInterpolatedU(8.0D); + double d2 = (double)icon.getMaxU(); + double d3 = (double)icon.getMinV(); + double d4 = (double)icon.getMaxV(); + int l1 = icon1.getOriginX(); + int i2 = icon1.getOriginY(); + double d5 = (double)icon1.getInterpolatedU(7.0D); + double d6 = (double)icon1.getInterpolatedU(9.0D); + double d7 = (double)icon1.getMinV(); + double d8 = (double)icon1.getInterpolatedV(8.0D); + double d9 = (double)icon1.getMaxV(); + + /*int blockTextureIndex; + int blockSideIndex; + + int j1 = iblockaccess.getBlockMetadata(x, y, z); + blockTextureIndex = pane.getBlockTextureFromSideAndMetadata(0, j1); + blockSideIndex = pane.getSideTextureIndex(j1); + + int k1 = (blockTextureIndex & 0xf) << 4; + int j2 = blockTextureIndex & 0xf0; + double d = (float) k1 / 256F; + double d1 = ((float) k1 + 7.99F) / 256F; + double d2 = ((float) k1 + 15.99F) / 256F; + double d3 = (float) j2 / 256F; + double d4 = ((float) j2 + 15.99F) / 256F; + int k2 = (blockSideIndex & 0xf) << 4; + int l2 = blockSideIndex & 0xf0; + double d5 = (float) (k2 + 7) / 256F; + double d6 = ((float) k2 + 8.99F) / 256F; + double d7 = (float) l2 / 256F; + double d8 = (float) (l2 + 8) / 256F; + double d9 = ((float) l2 + 15.99F) / 256F;*/ + + double xBot = x; + double xMid = (double) x + 0.5D; + double xTop = x + 1; + double zBot = z; + double zMid = (double) z + 0.5D; + double zTop = z + 1; + double xMidDown = ((double) x + 0.5D) - 0.0625D; + double xMidUp = (double) x + 0.5D + 0.0625D; + double zMidDown = ((double) z + 0.5D) - 0.0625D; + double zMidUp = (double) z + 0.5D + 0.0625D; + boolean west = pane.canConnectTo(iblockaccess.getBlockId(x, y, z - 1)); + boolean east = pane.canConnectTo(iblockaccess.getBlockId(x, y, z + 1)); + boolean south = pane.canConnectTo(iblockaccess.getBlockId(x - 1, y, z)); + boolean north = pane.canConnectTo(iblockaccess.getBlockId(x + 1, y, z)); + boolean renderAbove = pane.shouldSideBeRendered(iblockaccess, x, y + 1, z, 1); + boolean renderBelow = pane.shouldSideBeRendered(iblockaccess, x, y - 1, z, 0); + if ((!south || !north) && (south || north || west || east)) + { + if (south && !north) + { + tessellator.addVertexWithUV(xBot, y + 1, zMidDown, d, d3); + tessellator.addVertexWithUV(xBot, y + 0, zMidDown, d, d4); + tessellator.addVertexWithUV(xMid, y + 0, zMidDown, d1, d4); + tessellator.addVertexWithUV(xMid, y + 1, zMidDown, d1, d3); + tessellator.addVertexWithUV(xMid, y + 1, zMidUp, d, d3); + tessellator.addVertexWithUV(xMid, y + 0, zMidUp, d, d4); + tessellator.addVertexWithUV(xBot, y + 0, zMidUp, d1, d4); + tessellator.addVertexWithUV(xBot, y + 1, zMidUp, d1, d3); + if (!east && !west) + { + tessellator.addVertexWithUV(xMid, y + 1, zMidUp, d5, d7); + tessellator.addVertexWithUV(xMid, y + 0, zMidUp, d5, d9); + tessellator.addVertexWithUV(xMid, y + 0, zMidDown, d6, d9); + tessellator.addVertexWithUV(xMid, y + 1, zMidDown, d6, d7); + } + if (renderAbove || y < l - 1 && iblockaccess.isAirBlock(x - 1, y + 1, z)) + { + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidDown, d5, d9); + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidDown, d5, d8); + } + if (renderBelow || y > 1 && iblockaccess.isAirBlock(x - 1, y - 1, z)) + { + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidDown, d5, d9); + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidDown, d5, d8); + } + } + else if (!south && north) + { + tessellator.addVertexWithUV(xMid, y + 1, zMidDown, d1, d3); + tessellator.addVertexWithUV(xMid, y + 0, zMidDown, d1, d4); + tessellator.addVertexWithUV(xTop, y + 0, zMidDown, d2, d4); + tessellator.addVertexWithUV(xTop, y + 1, zMidDown, d2, d3); + tessellator.addVertexWithUV(xTop, y + 1, zMidUp, d1, d3); + tessellator.addVertexWithUV(xTop, y + 0, zMidUp, d1, d4); + tessellator.addVertexWithUV(xMid, y + 0, zMidUp, d2, d4); + tessellator.addVertexWithUV(xMid, y + 1, zMidUp, d2, d3); + if (!east && !west) + { + tessellator.addVertexWithUV(xMid, y + 1, zMidDown, d5, d7); + tessellator.addVertexWithUV(xMid, y + 0, zMidDown, d5, d9); + tessellator.addVertexWithUV(xMid, y + 0, zMidUp, d6, d9); + tessellator.addVertexWithUV(xMid, y + 1, zMidUp, d6, d7); + } + if (renderAbove || y < l - 1 && iblockaccess.isAirBlock(x + 1, y + 1, z)) + { + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidDown, d5, d8); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidDown, d5, d7); + } + if (renderBelow || y > 1 && iblockaccess.isAirBlock(x + 1, y - 1, z)) + { + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidDown, d5, d8); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidDown, d5, d7); + } + } + } + else + { + tessellator.addVertexWithUV(xBot, y + 1, zMidDown, d, d3); + tessellator.addVertexWithUV(xBot, y + 0, zMidDown, d, d4); + tessellator.addVertexWithUV(xTop, y + 0, zMidDown, d2, d4); + tessellator.addVertexWithUV(xTop, y + 1, zMidDown, d2, d3); + tessellator.addVertexWithUV(xTop, y + 1, zMidUp, d, d3); + tessellator.addVertexWithUV(xTop, y + 0, zMidUp, d, d4); + tessellator.addVertexWithUV(xBot, y + 0, zMidUp, d2, d4); + tessellator.addVertexWithUV(xBot, y + 1, zMidUp, d2, d3); + if (renderAbove) + { + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidDown, d5, d7); + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidDown, d5, d9); + } + else + { + if (y < l - 1 && iblockaccess.isAirBlock(x - 1, y + 1, z)) + { + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidDown, d5, d9); + tessellator.addVertexWithUV(xBot, (double) (y + 1) + 0.01D, zMidDown, d5, d8); + } + if (y < l - 1 && iblockaccess.isAirBlock(x + 1, y + 1, z)) + { + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xTop, (double) (y + 1) + 0.01D, zMidDown, d5, d8); + tessellator.addVertexWithUV(xMid, (double) (y + 1) + 0.01D, zMidDown, d5, d7); + } + } + if (renderBelow) + { + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidDown, d5, d7); + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidDown, d5, d9); + } + else + { + if (y > 1 && iblockaccess.isAirBlock(x - 1, y - 1, z)) + { + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidUp, d6, d9); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidDown, d5, d9); + tessellator.addVertexWithUV(xBot, (double) y - 0.01D, zMidDown, d5, d8); + } + if (y > 1 && iblockaccess.isAirBlock(x + 1, y - 1, z)) + { + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidUp, d6, d7); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidUp, d6, d8); + tessellator.addVertexWithUV(xTop, (double) y - 0.01D, zMidDown, d5, d8); + tessellator.addVertexWithUV(xMid, (double) y - 0.01D, zMidDown, d5, d7); + } + } + } + if ((!west || !east) && (south || north || west || east)) + { + if (west && !east) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zBot, d, d3); + tessellator.addVertexWithUV(xMidDown, y + 0, zBot, d, d4); + tessellator.addVertexWithUV(xMidDown, y + 0, zMid, d1, d4); + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d1, d3); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d, d3); + tessellator.addVertexWithUV(xMidUp, y + 0, zMid, d, d4); + tessellator.addVertexWithUV(xMidUp, y + 0, zBot, d1, d4); + tessellator.addVertexWithUV(xMidUp, y + 1, zBot, d1, d3); + if (!north && !south) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d5, d7); + tessellator.addVertexWithUV(xMidDown, y + 0, zMid, d5, d9); + tessellator.addVertexWithUV(xMidUp, y + 0, zMid, d6, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d6, d7); + } + if (renderAbove || y < l - 1 && iblockaccess.isAirBlock(x, y + 1, z - 1)) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d6, d8); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d5, d8); + tessellator.addVertexWithUV(xMidUp, y + 1, zBot, d5, d7); + } + if (renderBelow || y > 1 && iblockaccess.isAirBlock(x, y - 1, z - 1)) + { + tessellator.addVertexWithUV(xMidDown, y, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y, zMid, d6, d8); + tessellator.addVertexWithUV(xMidUp, y, zMid, d5, d8); + tessellator.addVertexWithUV(xMidUp, y, zBot, d5, d7); + } + } + else if (!west && east) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d1, d3); + tessellator.addVertexWithUV(xMidDown, y + 0, zMid, d1, d4); + tessellator.addVertexWithUV(xMidDown, y + 0, zTop, d2, d4); + tessellator.addVertexWithUV(xMidDown, y + 1, zTop, d2, d3); + tessellator.addVertexWithUV(xMidUp, y + 1, zTop, d1, d3); + tessellator.addVertexWithUV(xMidUp, y + 0, zTop, d1, d4); + tessellator.addVertexWithUV(xMidUp, y + 0, zMid, d2, d4); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d2, d3); + if (!north && !south) + { + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d5, d7); + tessellator.addVertexWithUV(xMidUp, y + 0, zMid, d5, d9); + tessellator.addVertexWithUV(xMidDown, y + 0, zMid, d6, d9); + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d6, d7); + } + if (renderAbove || y < l - 1 && iblockaccess.isAirBlock(x, y + 1, z + 1)) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d5, d8); + tessellator.addVertexWithUV(xMidDown, y + 1, zTop, d5, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d6, d8); + } + if (renderBelow || y > 1 && iblockaccess.isAirBlock(x, y - 1, z + 1)) + { + tessellator.addVertexWithUV(xMidDown, y, zMid, d5, d8); + tessellator.addVertexWithUV(xMidDown, y, zTop, d5, d9); + tessellator.addVertexWithUV(xMidUp, y, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y, zMid, d6, d8); + } + } + } + else + { + tessellator.addVertexWithUV(xMidDown, y + 1, zTop, d, d3); + tessellator.addVertexWithUV(xMidDown, y + 0, zTop, d, d4); + tessellator.addVertexWithUV(xMidDown, y + 0, zBot, d2, d4); + tessellator.addVertexWithUV(xMidDown, y + 1, zBot, d2, d3); + tessellator.addVertexWithUV(xMidUp, y + 1, zBot, d, d3); + tessellator.addVertexWithUV(xMidUp, y + 0, zBot, d, d4); + tessellator.addVertexWithUV(xMidUp, y + 0, zTop, d2, d4); + tessellator.addVertexWithUV(xMidUp, y + 1, zTop, d2, d3); + if (renderAbove) + { + tessellator.addVertexWithUV(xMidUp, y + 1, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y + 1, zBot, d5, d7); + tessellator.addVertexWithUV(xMidDown, y + 1, zTop, d5, d9); + } + else + { + if (y < l - 1 && iblockaccess.isAirBlock(x, y + 1, z - 1)) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d6, d8); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d5, d8); + tessellator.addVertexWithUV(xMidUp, y + 1, zBot, d5, d7); + } + if (y < l - 1 && iblockaccess.isAirBlock(x, y + 1, z + 1)) + { + tessellator.addVertexWithUV(xMidDown, y + 1, zMid, d5, d8); + tessellator.addVertexWithUV(xMidDown, y + 1, zTop, d5, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y + 1, zMid, d6, d8); + } + } + if (renderBelow) + { + tessellator.addVertexWithUV(xMidUp, y, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y, zBot, d5, d7); + tessellator.addVertexWithUV(xMidDown, y, zTop, d5, d9); + tessellator.addVertexWithUV(xMidUp, y, zBot, d6, d9); + tessellator.addVertexWithUV(xMidUp, y, zTop, d6, d7); + tessellator.addVertexWithUV(xMidDown, y, zTop, d5, d7); + tessellator.addVertexWithUV(xMidDown, y, zBot, d5, d9); + } + else + { + if (y > 1 && iblockaccess.isAirBlock(x, y - 1, z - 1)) + { + tessellator.addVertexWithUV(xMidDown, y, zBot, d6, d7); + tessellator.addVertexWithUV(xMidDown, y, zMid, d6, d8); + tessellator.addVertexWithUV(xMidUp, y, zMid, d5, d8); + tessellator.addVertexWithUV(xMidUp, y, zBot, d5, d7); + } + if (y > 1 && iblockaccess.isAirBlock(x, y - 1, z + 1)) + { + tessellator.addVertexWithUV(xMidDown, y, zMid, d5, d8); + tessellator.addVertexWithUV(xMidDown, y, zTop, d5, d9); + tessellator.addVertexWithUV(xMidUp, y, zTop, d6, d9); + tessellator.addVertexWithUV(xMidUp, y, zMid, d6, d8); + } + } + } + return true; + } + +} diff --git a/mods/tinker/tconstruct/client/gui/StencilTableGui.java b/mods/tinker/tconstruct/client/gui/StencilTableGui.java index 88cd7e91..d6ecbfc2 100644 --- a/mods/tinker/tconstruct/client/gui/StencilTableGui.java +++ b/mods/tinker/tconstruct/client/gui/StencilTableGui.java @@ -20,121 +20,125 @@ import cpw.mods.fml.common.network.PacketDispatcher; public class StencilTableGui extends GuiContainer { - StencilTableLogic logic; - int patternIndex; + StencilTableLogic logic; + int patternIndex; - public StencilTableGui(InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, int z) - { - super(new PatternShaperContainer(inventoryplayer, shaper)); - logic = shaper; - patternIndex = 0; - } + public StencilTableGui(InventoryPlayer inventoryplayer, StencilTableLogic shaper, World world, int x, int y, int z) + { + super(new PatternShaperContainer(inventoryplayer, shaper)); + logic = shaper; + patternIndex = 0; + } - public void onGuiClosed () - { - super.onGuiClosed(); - } + public void onGuiClosed () + { + super.onGuiClosed(); + } - @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { - fontRenderer.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - } + @Override + protected void drawGuiContainerForegroundLayer (int par1, int par2) + { + fontRenderer.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); + fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + } - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.renderEngine.bindTexture("/mods/tinker/textures/gui/patternshaper.png"); - int cornerX = (this.width - this.xSize) / 2; - int cornerY = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); - if (!logic.isStackInSlot(0)) - { - this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18); - } - } + protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + this.mc.renderEngine.bindTexture("/mods/tinker/textures/gui/patternshaper.png"); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); + if (!logic.isStackInSlot(0)) + { + this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18); + } + } - public void initGui () - { - super.initGui(); - int cornerX = (this.width - this.xSize) / 2; - int cornerY = (this.height - this.ySize) / 2; + public void initGui () + { + super.initGui(); + int cornerX = (this.width - this.xSize) / 2; + int cornerY = (this.height - this.ySize) / 2; - this.buttonList.clear(); - /*ToolGuiElement repair = TConstruct.toolButtons.get(0); - GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair - repairButton.enabled = false; - this.buttonList.add(repairButton);*/ - this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, "Next Pattern")); - this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, "Previous Pattern")); + this.buttonList.clear(); + /*ToolGuiElement repair = TConstruct.toolButtons.get(0); + GuiButtonTool repairButton = new GuiButtonTool(0, cornerX - 110, cornerY, repair.buttonIconX, repair.buttonIconY, repair.texture); // Repair + repairButton.enabled = false; + this.buttonList.add(repairButton);*/ + this.buttonList.add(new GuiButton(0, cornerX - 120, cornerY, 120, 20, "Next Pattern")); + this.buttonList.add(new GuiButton(1, cornerX - 120, cornerY + 20, 120, 20, "Previous Pattern")); - //for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++) - //{ + //for (int iter = 0; iter < TConstructContent.patternOutputs.length; iter++) + //{ - /*ToolGuiElement element = TConstruct.toolButtons.get(iter); - GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair - this.buttonList.add(button);*/ - //} - } + /*ToolGuiElement element = TConstruct.toolButtons.get(iter); + GuiButtonTool button = new GuiButtonTool(iter, cornerX - 110 + 22 * (iter % 5), cornerY + 22 * (iter / 5), element.buttonIconX, element.buttonIconY, element.texture); // Repair + this.buttonList.add(button);*/ + //} + } - protected void actionPerformed (GuiButton button) - { - ItemStack pattern = logic.getStackInSlot(0); - if (pattern != null && pattern.getItem() == TContent.blankPattern) - { - int meta = pattern.getItemDamage(); - if (meta == 0) - { - if (button.id == 0) - { - patternIndex++; - if (patternIndex >= TContent.patternOutputs.length-1) - patternIndex = 0; - } - else if (button.id == 1) - { - patternIndex--; - if (patternIndex < 0) - patternIndex = TContent.patternOutputs.length-2; - } - ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1); - logic.setInventorySlotContents(1, stack); - updateServer(stack); - } - else if (meta == 1) - { - ItemStack stack = new ItemStack(TContent.metalPattern, 1, 0); - logic.setInventorySlotContents(1, stack); - updateServer(stack); - } - } - } + protected void actionPerformed (GuiButton button) + { + ItemStack pattern = logic.getStackInSlot(0); + if (pattern != null && pattern.getItem() == TContent.blankPattern) + { + int meta = pattern.getItemDamage(); + if (meta == 0) + { + if (button.id == 0) + { + patternIndex++; + if (patternIndex == 21) + patternIndex++; + if (patternIndex >= TContent.patternOutputs.length) + patternIndex = 0; + } + else if (button.id == 1) + { + patternIndex--; + if (patternIndex == 21) + patternIndex--; + if (patternIndex < 0) + patternIndex = TContent.patternOutputs.length - 1; + } + ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1); + logic.setInventorySlotContents(1, stack); + updateServer(stack); + } + else if (meta == 1 || meta == 2) + { + ItemStack stack = new ItemStack(TContent.metalPattern, 1, 0); + logic.setInventorySlotContents(1, stack); + updateServer(stack); + } + } + } - void updateServer (ItemStack stack) - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(8); - DataOutputStream outputStream = new DataOutputStream(bos); - try - { - outputStream.writeByte(2); - outputStream.writeInt(logic.worldObj.provider.dimensionId); - outputStream.writeInt(logic.xCoord); - outputStream.writeInt(logic.yCoord); - outputStream.writeInt(logic.zCoord); - outputStream.writeShort(stack.itemID); - outputStream.writeShort(stack.getItemDamage()); - } - catch (Exception ex) - { - ex.printStackTrace(); - } + void updateServer (ItemStack stack) + { + ByteArrayOutputStream bos = new ByteArrayOutputStream(8); + DataOutputStream outputStream = new DataOutputStream(bos); + try + { + outputStream.writeByte(2); + outputStream.writeInt(logic.worldObj.provider.dimensionId); + outputStream.writeInt(logic.xCoord); + outputStream.writeInt(logic.yCoord); + outputStream.writeInt(logic.zCoord); + outputStream.writeShort(stack.itemID); + outputStream.writeShort(stack.getItemDamage()); + } + catch (Exception ex) + { + ex.printStackTrace(); + } - Packet250CustomPayload packet = new Packet250CustomPayload(); - packet.channel = "TConstruct"; - packet.data = bos.toByteArray(); - packet.length = bos.size(); + Packet250CustomPayload packet = new Packet250CustomPayload(); + packet.channel = "TConstruct"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); - PacketDispatcher.sendPacketToServer(packet); - } + PacketDispatcher.sendPacketToServer(packet); + } } diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java index fe29621e..11e80976 100644 --- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -225,6 +225,20 @@ public class ToolStationGui extends NewContainerGui } offset++; } + + if (categories.contains("bow")) + { + DecimalFormat df = new DecimalFormat("##.##"); + df.setRoundingMode(RoundingMode.DOWN); + int drawSpeed = tags.getInteger("DrawSpeed"); + float flightSpeed = tags.getFloat("FlightSpeed"); + float trueDraw = drawSpeed / 20f * flightSpeed; + this.fontRenderer.drawString("Draw Speed: " + df.format(trueDraw)+"s", xSize + 8, base + offset * 10, 0xffffff); + offset++; + this.fontRenderer.drawString("Arrow Speed: " + df.format(flightSpeed)+"x", xSize + 8, base + offset * 10, 0xffffff); + offset++; + offset++; + } //Mining if (categories.contains("dualharvest")) diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java index 6c235efe..5815ee7c 100644 --- a/mods/tinker/tconstruct/common/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -4,138 +4,21 @@ import java.lang.reflect.Field; import java.util.Collection; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.blocks.Aggregator; -import mods.tinker.tconstruct.blocks.DryingRack; -import mods.tinker.tconstruct.blocks.EquipBlock; -import mods.tinker.tconstruct.blocks.GlassBlock; -import mods.tinker.tconstruct.blocks.GlassBlockStained; -import mods.tinker.tconstruct.blocks.GravelOre; -import mods.tinker.tconstruct.blocks.LavaTankBlock; -import mods.tinker.tconstruct.blocks.LightCrystalBase; -import mods.tinker.tconstruct.blocks.LiquidMetalFlowing; -import mods.tinker.tconstruct.blocks.LiquidMetalStill; -import mods.tinker.tconstruct.blocks.MetalOre; -import mods.tinker.tconstruct.blocks.MultiBrick; -import mods.tinker.tconstruct.blocks.MultiBrickFancy; -import mods.tinker.tconstruct.blocks.OreberryBush; -import mods.tinker.tconstruct.blocks.RedstoneMachine; -import mods.tinker.tconstruct.blocks.SearedBlock; -import mods.tinker.tconstruct.blocks.SmelteryBlock; -import mods.tinker.tconstruct.blocks.SoilBlock; -import mods.tinker.tconstruct.blocks.SpeedBlock; -import mods.tinker.tconstruct.blocks.StoneTorch; -import mods.tinker.tconstruct.blocks.TMetalBlock; -import mods.tinker.tconstruct.blocks.ToolForgeBlock; -import mods.tinker.tconstruct.blocks.ToolStationBlock; -import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic; -import mods.tinker.tconstruct.blocks.logic.CastingTableLogic; -import mods.tinker.tconstruct.blocks.logic.DrawbridgeLogic; -import mods.tinker.tconstruct.blocks.logic.DryingRackLogic; -import mods.tinker.tconstruct.blocks.logic.FaucetLogic; -import mods.tinker.tconstruct.blocks.logic.FirestarterLogic; -import mods.tinker.tconstruct.blocks.logic.FrypanLogic; -import mods.tinker.tconstruct.blocks.logic.GlowstoneAggregator; -import mods.tinker.tconstruct.blocks.logic.LavaTankLogic; -import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; -import mods.tinker.tconstruct.blocks.logic.MultiServantLogic; -import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; -import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; -import mods.tinker.tconstruct.blocks.logic.SmelteryDrainLogic; -import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; -import mods.tinker.tconstruct.blocks.logic.StencilTableLogic; -import mods.tinker.tconstruct.blocks.logic.ToolForgeLogic; -import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; -import mods.tinker.tconstruct.entity.Automaton; -import mods.tinker.tconstruct.entity.BlueSlime; -import mods.tinker.tconstruct.entity.Crystal; -import mods.tinker.tconstruct.entity.FancyEntityItem; -import mods.tinker.tconstruct.entity.SlimeClone; -import mods.tinker.tconstruct.entity.projectile.DaggerEntity; -import mods.tinker.tconstruct.items.CraftingItem; -import mods.tinker.tconstruct.items.DiamondApple; -import mods.tinker.tconstruct.items.FilledBucket; -import mods.tinker.tconstruct.items.GoldenHead; -import mods.tinker.tconstruct.items.Manual; -import mods.tinker.tconstruct.items.MaterialItem; -import mods.tinker.tconstruct.items.MetalPattern; -import mods.tinker.tconstruct.items.OreBerries; -import mods.tinker.tconstruct.items.Pattern; -import mods.tinker.tconstruct.items.StrangeFood; -import mods.tinker.tconstruct.items.TitleIcon; -import mods.tinker.tconstruct.items.ToolPart; -import mods.tinker.tconstruct.items.ToolPartHidden; -import mods.tinker.tconstruct.items.ToolShard; -import mods.tinker.tconstruct.items.armor.Glove; -import mods.tinker.tconstruct.items.armor.HeartCanister; -import mods.tinker.tconstruct.items.armor.Knapsack; -import mods.tinker.tconstruct.items.armor.TArmorBase; -import mods.tinker.tconstruct.items.blocks.CraftedSoilItemBlock; -import mods.tinker.tconstruct.items.blocks.GlassBlockItem; -import mods.tinker.tconstruct.items.blocks.GravelOreItem; -import mods.tinker.tconstruct.items.blocks.LavaTankItemBlock; -import mods.tinker.tconstruct.items.blocks.LightCrystalItem; -import mods.tinker.tconstruct.items.blocks.LiquidItemBlock; -import mods.tinker.tconstruct.items.blocks.MetalItemBlock; -import mods.tinker.tconstruct.items.blocks.MetalOreItemBlock; -import mods.tinker.tconstruct.items.blocks.MultiBrickFancyItem; -import mods.tinker.tconstruct.items.blocks.MultiBrickItem; -import mods.tinker.tconstruct.items.blocks.OreberryBushItem; -import mods.tinker.tconstruct.items.blocks.OreberryBushSecondItem; -import mods.tinker.tconstruct.items.blocks.RedstoneMachineItem; -import mods.tinker.tconstruct.items.blocks.SearedTableItemBlock; -import mods.tinker.tconstruct.items.blocks.SmelteryItemBlock; -import mods.tinker.tconstruct.items.blocks.SpeedBlockItem; -import mods.tinker.tconstruct.items.blocks.StainedGlassClearItem; -import mods.tinker.tconstruct.items.blocks.ToolForgeItemBlock; -import mods.tinker.tconstruct.items.blocks.ToolStationItemBlock; -import mods.tinker.tconstruct.items.tools.BattleSign; -import mods.tinker.tconstruct.items.tools.Battleaxe; -import mods.tinker.tconstruct.items.tools.Broadsword; -import mods.tinker.tconstruct.items.tools.Chisel; -import mods.tinker.tconstruct.items.tools.Cleaver; -import mods.tinker.tconstruct.items.tools.Cutlass; -import mods.tinker.tconstruct.items.tools.Dagger; -import mods.tinker.tconstruct.items.tools.Excavator; -import mods.tinker.tconstruct.items.tools.FryingPan; -import mods.tinker.tconstruct.items.tools.Hammer; -import mods.tinker.tconstruct.items.tools.Hatchet; -import mods.tinker.tconstruct.items.tools.Longsword; -import mods.tinker.tconstruct.items.tools.LumberAxe; -import mods.tinker.tconstruct.items.tools.Mattock; -import mods.tinker.tconstruct.items.tools.Pickaxe; -import mods.tinker.tconstruct.items.tools.PotionLauncher; -import mods.tinker.tconstruct.items.tools.Rapier; -import mods.tinker.tconstruct.items.tools.Scythe; -import mods.tinker.tconstruct.items.tools.Shovel; -import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.client.TConstructClientRegistry; -import mods.tinker.tconstruct.library.crafting.Detailing; -import mods.tinker.tconstruct.library.crafting.DryingRackRecipes; -import mods.tinker.tconstruct.library.crafting.LiquidCasting; -import mods.tinker.tconstruct.library.crafting.PatternBuilder; -import mods.tinker.tconstruct.library.crafting.Smeltery; -import mods.tinker.tconstruct.library.crafting.ToolBuilder; -import mods.tinker.tconstruct.library.tools.ToolCore; -import mods.tinker.tconstruct.library.util.IPattern; -import mods.tinker.tconstruct.modifiers.ModAntiSpider; -import mods.tinker.tconstruct.modifiers.ModAttack; -import mods.tinker.tconstruct.modifiers.ModAutoSmelt; -import mods.tinker.tconstruct.modifiers.ModBlaze; -import mods.tinker.tconstruct.modifiers.ModButtertouch; -import mods.tinker.tconstruct.modifiers.ModDurability; -import mods.tinker.tconstruct.modifiers.ModElectric; -import mods.tinker.tconstruct.modifiers.ModExtraModifier; -import mods.tinker.tconstruct.modifiers.ModInteger; -import mods.tinker.tconstruct.modifiers.ModLapis; -import mods.tinker.tconstruct.modifiers.ModPiston; -import mods.tinker.tconstruct.modifiers.ModRedstone; -import mods.tinker.tconstruct.modifiers.ModReinforced; -import mods.tinker.tconstruct.modifiers.ModRepair; -import mods.tinker.tconstruct.modifiers.ModSmite; -import mods.tinker.tconstruct.modifiers.TActiveOmniMod; -import mods.tinker.tconstruct.util.PHConstruct; -import mods.tinker.tconstruct.util.RecipeRemover; -import mods.tinker.tconstruct.util.TDispenserBehaviorSpawnEgg; +import mods.tinker.tconstruct.blocks.*; +import mods.tinker.tconstruct.blocks.logic.*; +import mods.tinker.tconstruct.entity.*; +import mods.tinker.tconstruct.entity.projectile.*; +import mods.tinker.tconstruct.items.*; +import mods.tinker.tconstruct.items.armor.*; +import mods.tinker.tconstruct.items.blocks.*; +import mods.tinker.tconstruct.items.tools.*; +import mods.tinker.tconstruct.library.*; +import mods.tinker.tconstruct.library.client.*; +import mods.tinker.tconstruct.library.crafting.*; +import mods.tinker.tconstruct.library.tools.*; +import mods.tinker.tconstruct.library.util.*; +import mods.tinker.tconstruct.modifiers.*; +import mods.tinker.tconstruct.util.*; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.MapColor; @@ -198,7 +81,7 @@ public class TContent implements IFuelHandler public static ToolCore battlesign; public static ToolCore chisel; public static ToolCore mattock; - //public static ToolCore longbow; + public static ToolCore shortbow; public static ToolCore scythe; public static ToolCore lumberaxe; @@ -235,6 +118,8 @@ public class TContent implements IFuelHandler public static Item crossbar; public static Item fullGuard; + public static Item bowstring; + //Crafting blocks public static Block toolStationWood; public static Block toolStationStone; @@ -503,14 +388,21 @@ public class TContent implements IFuelHandler speedBlock = new SpeedBlock(PHConstruct.speedBlock).setUnlocalizedName("SpeedBlock"); GameRegistry.registerBlock(speedBlock, SpeedBlockItem.class, "SpeedBlock"); + //Glass glass = new GlassBlock(PHConstruct.glass).setUnlocalizedName("GlassBlock"); glass.stepSound = Block.soundGlassFootstep; GameRegistry.registerBlock(glass, GlassBlockItem.class, "GlassBlock"); + glassPane = new GlassPane(PHConstruct.glassPane); + GameRegistry.registerBlock(glassPane, GlassPaneItem.class, "GlassPane"); + stainedGlassClear = new GlassBlockStained(PHConstruct.stainedGlassClear, "stainedglass_").setUnlocalizedName("GlassBlock.StainedClear"); stainedGlassClear.stepSound = Block.soundGlassFootstep; GameRegistry.registerBlock(stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear"); + stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); + GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); + /*public static Block stainedGlass; public static Block stainedGlassClear;*/ @@ -600,6 +492,8 @@ public class TContent implements IFuelHandler hammer = new Hammer(PHConstruct.hammer); battleaxe = new Battleaxe(PHConstruct.battleaxe); + shortbow = new Shortbow(PHConstruct.shortbow); + Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe }; String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", "excavator", "hammer", "battleaxe" }; @@ -636,10 +530,12 @@ public class TContent implements IFuelHandler largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "_large_sword_blade").setUnlocalizedName("tconstruct.LargeSwordBlade"); hammerHead = new ToolPart(PHConstruct.hammerHead, "_hammer_head").setUnlocalizedName("tconstruct.HammerHead"); + bowstring = new Bowstring(PHConstruct.bowstring).setUnlocalizedName("tconstruct.bowstring"); + Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, heavyPlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard, - frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead }; + frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring }; String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard", - "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead" }; + "crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring" }; for (int i = 0; i < toolParts.length; i++) { @@ -718,6 +614,27 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 1, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", ""); + TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); //Wood + TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); //Stone + TConstructRegistry.addBowMaterial(2, 576, 40, 1.2f); //Iron + TConstructRegistry.addBowMaterial(3, 10, 80, 0.2f); //Flint + TConstructRegistry.addBowMaterial(4, 384, 20, 1.0f); //Cactus + TConstructRegistry.addBowMaterial(5, 192, 30, 1.0f); //Bone + TConstructRegistry.addBowMaterial(6, 10, 80, 0.2f); //Obsidian + TConstructRegistry.addBowMaterial(7, 10, 80, 0.2f); //Netherrack + TConstructRegistry.addBowMaterial(8, 1536, 20, 1.2f); //Slime + TConstructRegistry.addBowMaterial(9, 48, 25, 0.5f); //Paper + TConstructRegistry.addBowMaterial(10, 1152, 40, 1.2f); //Cobalt + TConstructRegistry.addBowMaterial(11, 960, 40, 1.2f); //Ardite + TConstructRegistry.addBowMaterial(12, 1536, 40, 1.2f); //Manyullyn + TConstructRegistry.addBowMaterial(13, 384, 40, 1.2f); //Copper + TConstructRegistry.addBowMaterial(14, 576, 40, 1.2f); //Bronze + TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); //Alumite + TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); //Steel + TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); //Blue Slime + + TConstructRegistry.addBowstringMaterial(0, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String + /*//Metallurgy TConstructRegistry.addToolMaterial(22, "Heptazion", 2, 2, 300, 800, 1, 1.0F, 0, 0f); TConstructRegistry.addToolMaterial(23, "Damascus Steel", 2, 3, 500, 600, 2, 1.35F, 1, 0f); @@ -786,7 +703,7 @@ public class TContent implements IFuelHandler { /* Tools */ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard }; + toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null }; int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; @@ -796,7 +713,8 @@ public class TContent implements IFuelHandler { for (int meta = 0; meta < patternOutputs.length; meta++) { - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, mat, new ItemStack(patternOutputs[meta], 1, mat)); } } } @@ -806,7 +724,8 @@ public class TContent implements IFuelHandler { for (int meta = 0; meta < patternOutputs.length; meta++) { - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, nonMetals[mat], new ItemStack(patternOutputs[meta], 1, nonMetals[mat])); } } } @@ -824,6 +743,7 @@ public class TContent implements IFuelHandler tb.addNormalToolRecipe(dagger, knifeBlade, toolRod, crossbar); tb.addNormalToolRecipe(cutlass, swordBlade, toolRod, fullGuard); tb.addNormalToolRecipe(chisel, chiselHead, toolRod); + tb.addNormalToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod); tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, heavyPlate, toughBinding); tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, heavyPlate, toughRod); @@ -831,6 +751,8 @@ public class TContent implements IFuelHandler tb.addNormalToolRecipe(hammer, hammerHead, toughRod, heavyPlate, heavyPlate); tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); + tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod); + ItemStack diamond = new ItemStack(Item.diamond); tb.registerToolMod(new ModRepair()); tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); @@ -948,16 +870,19 @@ public class TContent implements IFuelHandler for (int iter = 0; iter < patternOutputs.length; iter++) { - ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); - - tableCasting.addCastingRecipe(cast, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - tableCasting.addCastingRecipe(cast, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); - - for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) + if (patternOutputs[iter] != null) { - ItemStack metalCast = new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]); - tableCasting.addCastingRecipe(metalCast, new LiquidStack(liquids[iterTwo].itemID, ((IPattern) metalPattern).getPatternCost(metalCast) * TConstruct.ingotLiquidValue / 2, - liquids[iterTwo].itemMeta), cast, 50); + ItemStack cast = new ItemStack(metalPattern, 1, iter + 1); + + tableCasting.addCastingRecipe(cast, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue, 8), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + tableCasting.addCastingRecipe(cast, new LiquidStack(liquidMetalStill.blockID, TConstruct.ingotLiquidValue * 2, 1), new ItemStack(patternOutputs[iter], 1, Short.MAX_VALUE), false, 50); + + for (int iterTwo = 0; iterTwo < liquids.length; iterTwo++) + { + ItemStack metalCast = new ItemStack(patternOutputs[iter], 1, liquidDamage[iterTwo]); + tableCasting.addCastingRecipe(metalCast, new LiquidStack(liquids[iterTwo].itemID, ((IPattern) metalPattern).getPatternCost(metalCast) * TConstruct.ingotLiquidValue / 2, + liquids[iterTwo].itemMeta), cast, 50); + } } } @@ -1318,7 +1243,7 @@ public class TContent implements IFuelHandler { GameRegistry.addRecipe(new ItemStack(goldHead), surround, '#', new ItemStack(Item.goldNugget), 'm', new ItemStack(Item.skull, 1, 3)); } - + //Drying rack DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20, Item.leather); } @@ -1447,6 +1372,8 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.pistonStickyBase), "slimeball", Block.pistonBase)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Item.magmaCream), "slimeball", Item.blazePowder)); } + + public static boolean thaumcraftAvailable; public void intermodCommunication () { @@ -1493,12 +1420,18 @@ public class TContent implements IFuelHandler if (obj != null) { System.out.println("[TConstruct] Thaumcraft detected. Adding thaumium tools."); + thaumcraftAvailable = true; + TConstructClientRegistry.addMaterialRenderMapping(31, "tinker", "thaumium", true); TConstructRegistry.addToolMaterial(31, "Thaumium", 3, 400, 700, 2, 1.3F, 0, 0f, "\u00A75", "Thaumic"); PatternBuilder.instance.registerFullMaterial(new ItemStack((Item) obj, 1, 2), 2, "Thaumium", new ItemStack(toolShard, 1, 31), new ItemStack(toolRod, 1, 31), 31); for (int meta = 0; meta < patternOutputs.length; meta++) { - TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); + if (patternOutputs[meta] != null) + TConstructRegistry.addPartMapping(woodPattern.itemID, meta + 1, 31, new ItemStack(patternOutputs[meta], 1, 31)); } + + TConstructRegistry.addBowstringMaterial(1, new ItemStack((Item) obj, 1, 7), new ItemStack(bowstring, 1, 1), 1F, 1F, 0.85f); + TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f); } else { diff --git a/mods/tinker/tconstruct/common/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java index 593adca6..2747caf9 100644 --- a/mods/tinker/tconstruct/common/TProxyCommon.java +++ b/mods/tinker/tconstruct/common/TProxyCommon.java @@ -173,6 +173,7 @@ public class TProxyCommon implements IGuiHandler LanguageRegistry.addName(TContent.aggregator, "Glowstone Aggregator"); LanguageRegistry.addName(TContent.lightCrystalBase, "Lightstone Crystal"); LanguageRegistry.addName(TContent.knapsack, "Knapsack"); + LanguageRegistry.addName(TContent.shortbow, "Shortbow"); } @@ -215,9 +216,9 @@ public class TProxyCommon implements IGuiHandler " Excavator Head", " Hammer Head", " Full Guard" }; public static final String[] patterns = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "jewel" }; + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring" }; public static final String[] patternNames = new String[] { "Ingot", "Tool Rod", "Pickaxe Head", "Shovel Head", "Axe Head", "Sword Blade", "Wide Guard", "Hand Guard", "Crossbar", "Tool Binding", "Pan", "Board", "Knife Blade", "Chisel Head", "Tough Tool Rod", "Tough Binding", "Large Plate", "Broad Axe Head", "Scythe Head", "Broad Shovel Head", "Large Blade", "Hammer Head", - "Full Guard", "Jewel" }; + "Full Guard", "Bowstring" }; } diff --git a/mods/tinker/tconstruct/items/Bowstring.java b/mods/tinker/tconstruct/items/Bowstring.java new file mode 100644 index 00000000..25852580 --- /dev/null +++ b/mods/tinker/tconstruct/items/Bowstring.java @@ -0,0 +1,46 @@ +package mods.tinker.tconstruct.items; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import mods.tinker.tconstruct.library.util.IToolPart; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; + +public class Bowstring extends CraftingItem implements IToolPart +{ + public Bowstring(int id) + { + super(id, toolMaterialNames, buildTextureNames("_bowstring"), "parts/"); + this.setHasSubtypes(true); + this.setMaxDamage(0); + } + + private static String[] buildTextureNames (String textureType) + { + String[] names = new String[toolMaterialNames.length]; + for (int i = 0; i < toolMaterialNames.length; i++) + { + if (toolTextureNames[i].equals("")) + names[i] = ""; + else + names[i] = toolTextureNames[i] + textureType; + } + return names; + } + + public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric" }; + + public static final String[] toolTextureNames = new String[] { "string", "magicfabric" }; + + @Override + public int getMaterialID (ItemStack stack) + { + return stack.getItemDamage(); + } +} diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index 9388665e..a56b05cf 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -34,13 +34,13 @@ public class Pattern extends CraftingItem public static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", - "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "jewel" }; + "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "bowstring" }; public void getSubItems (int id, CreativeTabs tab, List list) { for (int i = 1; i < patternName.length; i++) { - if (i != 23) + //if (i != 23) list.add(new ItemStack(id, 1, i)); } } @@ -98,7 +98,7 @@ public class Pattern extends CraftingItem case 19: return 16; case 20: return 16; case 21: return 16; - case 22: return 2; + case 22: return 6; default: return 0; } } diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java index 4c98bd81..14089b74 100644 --- a/mods/tinker/tconstruct/items/ToolPart.java +++ b/mods/tinker/tconstruct/items/ToolPart.java @@ -2,15 +2,10 @@ package mods.tinker.tconstruct.items; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.util.IToolPart; -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; public class ToolPart extends CraftingItem implements IToolPart { @@ -34,23 +29,21 @@ public class ToolPart extends CraftingItem implements IToolPart return names; } - /*@SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) - { - this.icons = new Icon[textureNames.length]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:parts/"+textureNames[i]); - } - }*/ - public static final String[] toolMaterialNames = new String[] { "Wood", "Stone", "Iron", "Flint", "Cactus", "Bone", "Obsidian", "Netherrack", "Slime", "Paper", "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Alumite", "Steel", "Blue Slime", "", "", "", "", "", "", "", "", "", "", "", "", "", "Thaumium" }; public static final String[] toolTextureNames = new String[] { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime", "", "", "", "", "", "", "", "", "", "", "", "", "", "thaumium" }; + public void getSubItems (int id, CreativeTabs tab, List list) + { + for (int i = 0; i < 17; i++) + list.add(new ItemStack(id, 1, i)); + + if (TContent.thaumcraftAvailable) + list.add(new ItemStack(id, 1, 31)); + } + @Override public int getMaterialID (ItemStack stack) { diff --git a/mods/tinker/tconstruct/items/ToolShard.java b/mods/tinker/tconstruct/items/ToolShard.java index ea15b9ee..87d9b427 100644 --- a/mods/tinker/tconstruct/items/ToolShard.java +++ b/mods/tinker/tconstruct/items/ToolShard.java @@ -5,6 +5,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -55,8 +56,10 @@ public class ToolShard extends ToolPart list.add(new ItemStack(id, 1, i)); for (int i = 6; i < 9; i++) list.add(new ItemStack(id, 1, i)); - for (int i = 10; i < icons.length; i++) - if (!(textureNames[i].equals(""))) - list.add(new ItemStack(id, 1, i)); + for (int i = 10; i < 17; i++) + list.add(new ItemStack(id, 1, i)); + + if (TContent.thaumcraftAvailable) + list.add(new ItemStack(id, 1, 31)); } } diff --git a/mods/tinker/tconstruct/items/blocks/GlassPaneItem.java b/mods/tinker/tconstruct/items/blocks/GlassPaneItem.java new file mode 100644 index 00000000..c88b31fc --- /dev/null +++ b/mods/tinker/tconstruct/items/blocks/GlassPaneItem.java @@ -0,0 +1,36 @@ +package mods.tinker.tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class GlassPaneItem extends ItemBlock +{ + public static final String blockType[] = + { + "glass.pure", "glass.soul", "glass.soul.pure" + }; + + public GlassPaneItem(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata(int meta) + { + return meta; + } + + public String getUnlocalizedName(ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length-1); + return (new StringBuilder()).append("block.").append(blockType[pos]).append(".pane").toString(); + } +} diff --git a/mods/tinker/tconstruct/items/blocks/StainedGlassClearPaneItem.java b/mods/tinker/tconstruct/items/blocks/StainedGlassClearPaneItem.java new file mode 100644 index 00000000..1a211af2 --- /dev/null +++ b/mods/tinker/tconstruct/items/blocks/StainedGlassClearPaneItem.java @@ -0,0 +1,33 @@ +package mods.tinker.tconstruct.items.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; + +public class StainedGlassClearPaneItem extends ItemBlock +{ + public static final String blockType[] = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; + + public StainedGlassClearPaneItem(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata (int meta) + { + return meta; + } + + public String getUnlocalizedName (ItemStack itemstack) + { + int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); + return (new StringBuilder()).append("block.stainedglass.pane.").append(blockType[pos]).toString(); + } +} diff --git a/mods/tinker/tconstruct/items/tools/BattleSign.java b/mods/tinker/tconstruct/items/tools/BattleSign.java index b684d453..398174c4 100644 --- a/mods/tinker/tconstruct/items/tools/BattleSign.java +++ b/mods/tinker/tconstruct/items/tools/BattleSign.java @@ -125,7 +125,7 @@ public class BattleSign extends Weapon public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } diff --git a/mods/tinker/tconstruct/items/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java index 40b70be4..8f01d587 100644 --- a/mods/tinker/tconstruct/items/tools/Chisel.java +++ b/mods/tinker/tconstruct/items/tools/Chisel.java @@ -139,12 +139,6 @@ public class Chisel extends ToolCore return EnumAction.eat; } - @Override - public int getHeadType () - { - return 1; - } - @SideOnly(Side.CLIENT) @Override public int getRenderPasses (int metadata) @@ -162,7 +156,7 @@ public class Chisel extends ToolCore public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } diff --git a/mods/tinker/tconstruct/items/tools/FryingPan.java b/mods/tinker/tconstruct/items/tools/FryingPan.java index 3b5f0297..da84e0b4 100644 --- a/mods/tinker/tconstruct/items/tools/FryingPan.java +++ b/mods/tinker/tconstruct/items/tools/FryingPan.java @@ -44,7 +44,8 @@ public class FryingPan extends Weapon return true; } - public void onEntityDamaged(World world, EntityPlayer player, Entity entity) + @Override + public void onEntityDamaged(World world, EntityLiving player, Entity entity) { world.playSoundEffect(entity.posX, entity.posY, entity.posZ, "sounds.frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); } @@ -165,7 +166,7 @@ public class FryingPan extends Weapon public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } diff --git a/mods/tinker/tconstruct/items/tools/Hatchet.java b/mods/tinker/tconstruct/items/tools/Hatchet.java index 4e57e597..e1e9d2b3 100644 --- a/mods/tinker/tconstruct/items/tools/Hatchet.java +++ b/mods/tinker/tconstruct/items/tools/Hatchet.java @@ -19,13 +19,7 @@ public class Hatchet extends HarvestTool super(itemID, 3); this.setUnlocalizedName("InfiTool.Axe"); } - - @Override - public int getHeadType () - { - return 1; - } - + @Override protected Material[] getEffectiveMaterials () { @@ -79,7 +73,7 @@ public class Hatchet extends HarvestTool public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } diff --git a/mods/tinker/tconstruct/items/tools/Pickaxe.java b/mods/tinker/tconstruct/items/tools/Pickaxe.java index 385e2d63..437e6ffe 100644 --- a/mods/tinker/tconstruct/items/tools/Pickaxe.java +++ b/mods/tinker/tconstruct/items/tools/Pickaxe.java @@ -13,12 +13,6 @@ public class Pickaxe extends HarvestTool this.setUnlocalizedName("InfiTool.Pickaxe"); } - @Override - public int getHeadType () - { - return 1; - } - @Override protected String getHarvestType() { diff --git a/mods/tinker/tconstruct/items/tools/RangedWeapon.java b/mods/tinker/tconstruct/items/tools/RangedWeapon.java deleted file mode 100644 index 8e1ddd3d..00000000 --- a/mods/tinker/tconstruct/items/tools/RangedWeapon.java +++ /dev/null @@ -1,314 +0,0 @@ -package mods.tinker.tconstruct.items.tools; - -import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.tools.ToolCore; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; -import net.minecraftforge.event.entity.player.ArrowNockEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public abstract class RangedWeapon extends ToolCore -{ - - public RangedWeapon(int itemID) - { - super(itemID, 0); - } - - @Override - public int getHeadType () - { - return 0; - } - - @Override - public Item getHeadItem () - { - return TContent.toolRod; - } - - @Override - public Item getAccessoryItem () - { - return TContent.toolRod; - } - - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 7; - } - - /* Bow usage */ - public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) - { - int var6 = this.getMaxItemUseDuration(par1ItemStack) - par4; - - ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, par1ItemStack, var6); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { - return; - } - var6 = event.charge; - - boolean var5 = par3EntityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, par1ItemStack) > 0; - - if (var5 || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) - { - float var7 = (float)var6 / 20.0F; - var7 = (var7 * var7 + var7 * 2.0F) / 3.0F; - - if ((double)var7 < 0.1D) - { - return; - } - - if (var7 > 1.0F) - { - var7 = 1.0F; - } - - EntityArrow var8 = new EntityArrow(par2World, par3EntityPlayer, var7 * 2.0F); - - if (var7 == 1.0F) - { - var8.setIsCritical(true); - } - - int var9 = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, par1ItemStack); - - if (var9 > 0) - { - var8.setDamage(var8.getDamage() + (double)var9 * 0.5D + 0.5D); - } - - int var10 = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, par1ItemStack); - - if (var10 > 0) - { - var8.setKnockbackStrength(var10); - } - - if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, par1ItemStack) > 0) - { - var8.setFire(100); - } - - par1ItemStack.damageItem(1, par3EntityPlayer); - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + var7 * 0.5F); - - if (var5) - { - var8.canBePickedUp = 2; - } - else - { - par3EntityPlayer.inventory.consumeInventoryItem(Item.arrow.itemID); - } - - if (!par2World.isRemote) - { - par2World.spawnEntityInWorld(var8); - } - } - } - - public ItemStack onFoodEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - return par1ItemStack; - } - - /** - * How long it takes to use or consume an item - */ - public int getMaxItemUseDuration(ItemStack par1ItemStack) - { - return 72000; - } - - /** - * returns the action that specifies what animation to play when the items is being used - */ - public EnumAction getItemUseAction(ItemStack par1ItemStack) - { - return EnumAction.bow; - } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - ArrowNockEvent event = new ArrowNockEvent(par3EntityPlayer, par1ItemStack); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - { - return event.result; - } - - if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) - { - par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); - } - - return par1ItemStack; - } - - @SideOnly(Side.CLIENT) - @Override - public boolean requiresMultipleRenderPasses () - { - return true; - } - - /* Rendering */ - @SideOnly(Side.CLIENT) - //@Override - public int getIconIndex (ItemStack stack, int pass) - { - if (!stack.hasTagCompound()) - return 255; - - NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("InfiTool")) - { - if (pass == 0) // Handle - { - return tags.getCompoundTag("InfiTool").getInteger("RenderHandle"); - } - - if (pass == 1) // Head - { - return tags.getCompoundTag("InfiTool").getInteger("RenderHead") + 64; - } - - if (pass == 2) // Accessory - { - if (tags.getCompoundTag("InfiTool").hasKey("RenderAccessory")) - { - int index = tags.getCompoundTag("InfiTool").getInteger("RenderAccessory"); - if (index == -1) - return 32; - return index + 32; - } - } - - if (pass == 4) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect1")) - return tags.getCompoundTag("InfiTool").getInteger("Effect1") + 224; - else - return 255; - } - - if (pass == 5) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect2")) - return tags.getCompoundTag("InfiTool").getInteger("Effect2") + 224; - else - return 255; - } - - if (pass == 6) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect3")) - return tags.getCompoundTag("InfiTool").getInteger("Effect3") + 224; - else - return 255; - } - } - - return 255; //Keep 255 blank - } - /* Animations */ - //@Override - public int getIconIndex(ItemStack stack, int pass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - /* - * Here is an example usage for Vanilla bows. - if (usingItem != null && usingItem.getItem().itemID == Item.bow.itemID) - { - int k = usingItem.getMaxItemUseDuration() - useRemaining; - if (k >= 18) return 133; - if (k > 13) return 117; - if (k > 0) return 101; - } - */ - - /*if (!stack.hasTagCompound()) - return 255; - - NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("InfiTool")) - { - if (pass == 0) // Handle - { - return tags.getCompoundTag("InfiTool").getInteger("RenderHandle"); - } - - if (pass == 1) // Head - { - return tags.getCompoundTag("InfiTool").getInteger("RenderHead") + 64; - } - - if (pass == 2) // Accessory - { - if (tags.getCompoundTag("InfiTool").hasKey("RenderAccessory")) - { - int index = tags.getCompoundTag("InfiTool").getInteger("RenderAccessory"); - if (index == -1) - return 32; - return index + 32; - } - } - - if (pass == 4) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect1")) - return tags.getCompoundTag("InfiTool").getInteger("Effect1") + 224; - else - return 255; - } - - if (pass == 5) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect2")) - return tags.getCompoundTag("InfiTool").getInteger("Effect2") + 224; - else - return 255; - } - - if (pass == 6) - { - if (tags.getCompoundTag("InfiTool").hasKey("Effect3")) - return tags.getCompoundTag("InfiTool").getInteger("Effect3") + 224; - else - return 255; - } - } - - return 255; //Keep 255 blank - */ - if (usingItem != null && usingItem.getItem().itemID == this.itemID) - { - int k = usingItem.getMaxItemUseDuration() - useRemaining; - if (k >= 18) return 0; - if (k > 13) return 1; - if (k > 0) return 2; - } - return 240; - } - -} diff --git a/mods/tinker/tconstruct/items/tools/Shortbow.java b/mods/tinker/tconstruct/items/tools/Shortbow.java new file mode 100644 index 00000000..278e7fa1 --- /dev/null +++ b/mods/tinker/tconstruct/items/tools/Shortbow.java @@ -0,0 +1,68 @@ +package mods.tinker.tconstruct.items.tools; + +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.tools.BowBase; +import net.minecraft.item.Item; + +public class Shortbow extends BowBase +{ + public Shortbow(int itemID) + { + super(itemID); + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_bow_top"; + case 1: + return "_bowstring_broken"; + case 2: + return "_bowstring"; + case 3: + return "_bow_bottom"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_bow_effect"; + } + + @Override + public String getDefaultFolder () + { + return "shortbow"; + } + + @Override + public Item getHeadItem () + { + return TContent.toolRod; + } + + @Override + public Item getHandleItem () + { + return TContent.bowstring; + } + + @Override + public Item getAccessoryItem () + { + return TContent.toolRod; + } + + @Override + public String[] toolCategories () + { + return new String[] { "weapon", "ranged", "bow" }; + } + +} diff --git a/mods/tinker/tconstruct/items/tools/Shovel.java b/mods/tinker/tconstruct/items/tools/Shovel.java index 3bcd6c35..57e8acac 100644 --- a/mods/tinker/tconstruct/items/tools/Shovel.java +++ b/mods/tinker/tconstruct/items/tools/Shovel.java @@ -15,12 +15,6 @@ public class Shovel extends HarvestTool this.setUnlocalizedName("InfiTool.Shovel"); } - @Override - public int getHeadType () - { - return 1; - } - @Override protected Material[] getEffectiveMaterials() { @@ -64,7 +58,7 @@ public class Shovel extends HarvestTool public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); } diff --git a/mods/tinker/tconstruct/library/TConstructRegistry.java b/mods/tinker/tconstruct/library/TConstructRegistry.java index 304add59..66a05540 100644 --- a/mods/tinker/tconstruct/library/TConstructRegistry.java +++ b/mods/tinker/tconstruct/library/TConstructRegistry.java @@ -93,7 +93,7 @@ public class TConstructRegistry * * Patterns - These have a suffix of Pattern or Cast. ex: hatchetHeadPattern * ingot, toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, - * knifeBlade, chiselHead, toughRod, toughBinding, largePlate, broadAxeHead, scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard + * knifeBlade, chiselHead, toughRod, toughBinding, largePlate, broadAxeHead, scytheHead, excavatorHead, largeBlade, hammerHead, fullGuard, bowstring */ static HashMap itemstackDirectory = new HashMap(); @@ -296,6 +296,62 @@ public class TConstructRegistry { return (toolMaterialStrings.get(key)); } + + //Bow materials + public static HashMap bowMaterials = new HashMap(40); + + public static void addBowMaterial(int materialID, int durability, int drawSpeed, float speedMax) + { + BowMaterial mat = bowMaterials.get(materialID); + if (mat == null) + { + mat = new BowMaterial(durability, drawSpeed, speedMax); + bowMaterials.put(materialID, mat); + //toolMaterialStrings.put(materialName, mat); + } + else + throw new IllegalArgumentException("[TCon API] Bow Material ID " + materialID + " is already occupied"); + } + + public static boolean validBowMaterial(int materialID) + { + return bowMaterials.containsKey(materialID); + } + + public static BowMaterial getBowMaterial(int materialID) + { + return bowMaterials.get(materialID); + } + + public static ArrayList bowstringMaterials = new ArrayList(); + + public static void addBowstringMaterial(int materialID, ItemStack stack, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed) + { + BowstringMaterial mat = new BowstringMaterial(materialID, stack, craftingMaterial, durability, drawSpeed, flightSpeed); + bowstringMaterials.add(mat); + } + + public static BowstringMaterial getBowstringMaterial(int materialID) + { + for (BowstringMaterial mat : bowstringMaterials) + { + if (mat.materialID == materialID) + return mat; + } + return null; + } + + public static ItemStack craftBowString(ItemStack stack) + { + for (BowstringMaterial mat : bowstringMaterials) + { + System.out.println("mat: "+mat.input); + //if (ItemStack.areItemStacksEqual(stack, mat.input)) + if (stack.isItemEqual(mat.input)) + return mat.craftingItem.copy(); + } + return null; + } public static LiquidCasting getTableCasting () { diff --git a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java index 4c68328f..fe64a7b4 100644 --- a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java +++ b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java @@ -34,6 +34,21 @@ public class TConstructClientRegistry tool.registerPartPaths(materialID, toolIcons); } } + + public static void addAlternateMaterialRenderMapping (ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) + { + String[] toolIcons = new String[tool.getPartAmount() + 1]; + for (int i = 0; i < tool.getPartAmount() + 1; i++) + { + String icon = domain + ":"; + if (useDefaultFolder) + icon += tool.getDefaultFolder() + "/"; + icon += renderName + tool.getIconSuffix(i); + toolIcons[i] = icon; + } + tool.registerAlternatePartPaths(materialID, toolIcons); + } + public static void addEffectRenderMapping (ToolCore tool, int materialID, String domain, String renderName, boolean useDefaultFolder) { String icon = domain + ":"; @@ -114,7 +129,7 @@ public class TConstructClientRegistry recipe[2] = bottominput; recipeIcons.put(name, recipe); } - + public static void registerManualSmeltery (String name, ItemStack output, ItemStack liquid, ItemStack cast) { ItemStack[] recipe = new ItemStack[3]; diff --git a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java index 3abd2e57..3a628668 100644 --- a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java @@ -5,10 +5,15 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import mods.tinker.tconstruct.library.event.PartBuilderEvent; +import mods.tinker.tconstruct.library.event.ToolCraftEvent; +import mods.tinker.tconstruct.library.tools.ToolMaterial; import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event.Result; public class PatternBuilder { @@ -49,6 +54,18 @@ public class PatternBuilder { if (material != null && pattern != null) { + PartBuilderEvent.NormalPart event = new PartBuilderEvent.NormalPart(material, pattern, otherPattern); + MinecraftForge.EVENT_BUS.post(event); + + if (event.getResult() == Result.ALLOW) + { + return event.getResultStacks(); + } + else if (event.getResult() == Result.DENY) + { + return null; + } + ItemKey key = getItemKey(material); if (key != null) { diff --git a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java index 373a1fd7..0a705c6f 100644 --- a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event.Result; public class ToolBuilder { @@ -308,10 +309,21 @@ public class ToolBuilder compound.getCompoundTag("display").setString("Name", "\u00A7f" + name); } - ToolCraftEvent event = new ToolCraftEvent(item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat}); + ToolCraftEvent.NormalTool event = new ToolCraftEvent.NormalTool(item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat}); MinecraftForge.EVENT_BUS.post(event); - - tool.setTagCompound(compound); + + if (event.getResult() == Result.DEFAULT) + { + tool.setTagCompound(compound); + } + else if (event.getResult() == Result.ALLOW) + { + tool = event.getResultStack(); + } + else + { + tool = null; + } return tool; } diff --git a/mods/tinker/tconstruct/library/event/PartBuilderEvent.java b/mods/tinker/tconstruct/library/event/PartBuilderEvent.java new file mode 100644 index 00000000..b854c77e --- /dev/null +++ b/mods/tinker/tconstruct/library/event/PartBuilderEvent.java @@ -0,0 +1,54 @@ +package mods.tinker.tconstruct.library.event; + +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMaterial; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.event.Event; + +/* This event fires after all of the other construction. The resulting nbttag is added to the tool + * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. + */ + +public class PartBuilderEvent extends Event +{ + public final ItemStack material; + public final ItemStack pattern; + public final ItemStack otherPattern; + protected ItemStack[] resultStacks; + + public PartBuilderEvent(ItemStack material, ItemStack pattern, ItemStack otherPattern) + { + this.material = material; + this.pattern = pattern; + this.otherPattern = otherPattern; + } + + @HasResult + public static class NormalPart extends PartBuilderEvent + { + public NormalPart(ItemStack material, ItemStack pattern, ItemStack otherPattern) + { + super(material, pattern, otherPattern); + } + + /** Fires before other processing is done + * + * Result is significant: + * DEFAULT: Allows part to be crafted normally + * ALLOW: Uses resultStack instead + * DENY: Stops part crafting altogether + */ + + public void overrideResult(ItemStack[] result) + { + resultStacks = result; + this.setResult(Result.ALLOW); + } + + public ItemStack[] getResultStacks() + { + return resultStacks; + } + } +} diff --git a/mods/tinker/tconstruct/library/event/ToolCraftEvent.java b/mods/tinker/tconstruct/library/event/ToolCraftEvent.java index fd3e01a6..eeaa8c51 100644 --- a/mods/tinker/tconstruct/library/event/ToolCraftEvent.java +++ b/mods/tinker/tconstruct/library/event/ToolCraftEvent.java @@ -2,6 +2,7 @@ package mods.tinker.tconstruct.library.event; import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.tools.ToolMaterial; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.Event; @@ -14,6 +15,7 @@ public class ToolCraftEvent extends Event public final ToolCore tool; public final NBTTagCompound toolTag; public final ToolMaterial[] materials; + protected ItemStack resultStack; public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) { @@ -21,4 +23,32 @@ public class ToolCraftEvent extends Event this.toolTag = toolTag; this.materials = materials; } + + @HasResult + public static class NormalTool extends ToolCraftEvent + { + public NormalTool(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) + { + super(tool, toolTag, materials); + } + + /** Fires just before the tool is put together + * + * Result is significant: + * DEFAULT: Allows tool to be crafted normally + * ALLOW: Uses resultStack instead + * DENY: Stops tool crafting altogether + */ + + public void overrideResult(ItemStack result) + { + resultStack = result; + this.setResult(Result.ALLOW); + } + + public ItemStack getResultStack() + { + return resultStack; + } + } } diff --git a/mods/tinker/tconstruct/library/tools/AbilityHelper.java b/mods/tinker/tconstruct/library/tools/AbilityHelper.java index 1bbbc81d..af510af8 100644 --- a/mods/tinker/tconstruct/library/tools/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/tools/AbilityHelper.java @@ -194,7 +194,15 @@ public class AbilityHelper if (causedDamage) { - damageTool(stack, 1, player, false); + int reinforced = 0; + if (toolTags.hasKey("Unbreaking")) + reinforced = tags.getCompoundTag("InfiTool").getInteger("Unbreaking"); + + if (random.nextInt(10) < 10 - reinforced) + { + damageTool(stack, 1, tags, player, false); + } + //damageTool(stack, 1, player, false); tool.onEntityDamaged(player.worldObj, player, entity); int drain = toolTags.getInteger("Necrotic") * 2; if (drain > 0) diff --git a/mods/tinker/tconstruct/library/tools/BowBase.java b/mods/tinker/tconstruct/library/tools/BowBase.java new file mode 100644 index 00000000..02a3aece --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/BowBase.java @@ -0,0 +1,714 @@ +package mods.tinker.tconstruct.library.tools; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class BowBase extends ToolCore +{ + public BowBase(int itemID) + { + super(itemID, 0); + } + + public int durabilityTypeAccessory () + { + return 2; + } + + /*@SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 7; + }*/ + + /* Bow usage */ + public void onPlayerStoppedUsing (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer, int useRemaining) + { + int time = this.getMaxItemUseDuration(stack) - useRemaining; + + ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, stack, time); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) + { + return; + } + time = event.charge; + + boolean var5 = par3EntityPlayer.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + + if (var5 || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) + { + NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); + float drawTime = toolTag.getInteger("DrawSpeed"); + float flightSpeed = toolTag.getFloat("FlightSpeed"); + float speedBase = (float) time / drawTime; + speedBase = (speedBase * speedBase + speedBase * 2.0F) / 3.0F; + + if ((double) speedBase < 0.1D) + { + return; + } + + if (speedBase > flightSpeed) + { + speedBase = flightSpeed; + } + + EntityArrow arrowEntity = new EntityArrow(par2World, par3EntityPlayer, speedBase * 2.0F); + + if (speedBase >= 1.0F) + { + arrowEntity.setIsCritical(true); + } + + int var9 = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack); + + if (var9 > 0) + { + arrowEntity.setDamage(arrowEntity.getDamage() + (double) var9 * 0.5D + 0.5D); + } + + int var10 = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, stack); + + if (var10 > 0) + { + arrowEntity.setKnockbackStrength(var10); + } + + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) + { + arrowEntity.setFire(100); + } + + stack.damageItem(1, par3EntityPlayer); + par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + speedBase * 0.5F); + + if (var5) + { + arrowEntity.canBePickedUp = 2; + } + else + { + par3EntityPlayer.inventory.consumeInventoryItem(Item.arrow.itemID); + } + + if (!par2World.isRemote) + { + par2World.spawnEntityInWorld(arrowEntity); + } + } + } + + public ItemStack onFoodEaten (ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) + { + return stack; + } + + /** + * How long it takes to use or consume an item + */ + public int getMaxItemUseDuration (ItemStack par1ItemStack) + { + return 72000; + } + + /** + * returns the action that specifies what animation to play when the items is being used + */ + public EnumAction getItemUseAction (ItemStack par1ItemStack) + { + return EnumAction.bow; + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer + */ + public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + ArrowNockEvent event = new ArrowNockEvent(par3EntityPlayer, par1ItemStack); + MinecraftForge.EVENT_BUS.post(event); + if (event.isCanceled()) + { + return event.result; + } + + if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.arrow.itemID)) + { + par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); + } + + return par1ItemStack; + } + + @SideOnly(Side.CLIENT) + @Override + public boolean requiresMultipleRenderPasses () + { + return true; + } + + /* Rendering */ + @Override + public void registerIcons (IconRegister iconRegister) + { + super.registerIcons(iconRegister); + headIcons1.clear(); + handleIcons1.clear(); + accessoryIcons1.clear(); + extraIcons1.clear(); + effectIcons1.clear(); + Iterator iterOne = headStrings.entrySet().iterator(); + while (iterOne.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterOne.next(); + headIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + } + + iterOne = handleStrings.entrySet().iterator(); + while (iterOne.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterOne.next(); + handleIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + } + + if (getPartAmount() > 2) + { + iterOne = accessoryStrings.entrySet().iterator(); + while (iterOne.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterOne.next(); + accessoryIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + } + } + + if (getPartAmount() > 3) + { + iterOne = extraStrings.entrySet().iterator(); + while (iterOne.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterOne.next(); + extraIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + } + } + + iterOne = effectStrings.entrySet().iterator(); + while (iterOne.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterOne.next(); + effectIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_1")); + } + + headIcons2.clear(); + handleIcons2.clear(); + accessoryIcons2.clear(); + extraIcons2.clear(); + effectIcons2.clear(); + Iterator iterTwo = headStrings.entrySet().iterator(); + while (iterTwo.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterTwo.next(); + headIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + } + + iterTwo = handleStrings.entrySet().iterator(); + while (iterTwo.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterTwo.next(); + handleIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + } + + if (getPartAmount() > 2) + { + iterTwo = accessoryStrings.entrySet().iterator(); + while (iterTwo.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterTwo.next(); + accessoryIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + } + } + + if (getPartAmount() > 3) + { + iterTwo = extraStrings.entrySet().iterator(); + while (iterTwo.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterTwo.next(); + extraIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + } + } + + iterTwo = effectStrings.entrySet().iterator(); + while (iterTwo.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterTwo.next(); + effectIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_2")); + } + + headIcons3.clear(); + handleIcons3.clear(); + accessoryIcons3.clear(); + extraIcons3.clear(); + effectIcons3.clear(); + Iterator iterThree = headStrings.entrySet().iterator(); + while (iterThree.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterThree.next(); + headIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + } + + iterThree = handleStrings.entrySet().iterator(); + while (iterThree.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterThree.next(); + handleIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + } + + if (getPartAmount() > 2) + { + iterThree = accessoryStrings.entrySet().iterator(); + while (iterThree.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterThree.next(); + accessoryIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + } + } + + if (getPartAmount() > 3) + { + iterThree = extraStrings.entrySet().iterator(); + while (iterThree.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterThree.next(); + extraIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + } + } + + iterThree = effectStrings.entrySet().iterator(); + while (iterThree.hasNext()) + { + Map.Entry pairs = (Map.Entry) iterThree.next(); + effectIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue()+"_3")); + } + + registerArrows(iconRegister); + } + + void registerArrows(IconRegister iconRegister) + { + arrow1 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_1"); + arrow2 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_2"); + arrow3 = iconRegister.registerIcon("tinker:"+getDefaultFolder()+"/arrow_3"); + } + + @Override + public Icon getIcon (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound(); + + if (tags != null) + { + tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (renderPass < getPartAmount()) + { + if (renderPass == 0) // Handle + { + if (tags.getBoolean("Broken")) + return (brokenIcons.get(tags.getInteger("RenderHandle"))); + return handleIcons.get(tags.getInteger("RenderHandle")); + } + + else if (renderPass == 1) // Head + { + return (headIcons.get(tags.getInteger("RenderHead"))); + } + + else if (renderPass == 2) // Accessory + { + return (accessoryIcons.get(tags.getInteger("RenderAccessory"))); + } + + else if (renderPass == 3) // Extra + { + return (extraIcons.get(tags.getInteger("RenderExtra"))); + } + } + + else + { + if (renderPass == getPartAmount()) + { + if (tags.hasKey("Effect1")) + return (effectIcons.get(tags.getInteger("Effect1"))); + } + + else if (renderPass == getPartAmount() + 1) + { + if (tags.hasKey("Effect2")) + return (effectIcons.get(tags.getInteger("Effect2"))); + } + + else if (renderPass == getPartAmount() + 2) + { + if (tags.hasKey("Effect3")) + return (effectIcons.get(tags.getInteger("Effect3"))); + } + + else if (renderPass == getPartAmount() + 3) + { + if (tags.hasKey("Effect4")) + return (effectIcons.get(tags.getInteger("Effect4"))); + } + + else if (renderPass == getPartAmount() + 4) + { + if (tags.hasKey("Effect5")) + return (effectIcons.get(tags.getInteger("Effect5"))); + } + + else if (renderPass == getPartAmount() + 5) + { + if (tags.hasKey("Effect6")) + return (effectIcons.get(tags.getInteger("Effect6"))); + } + } + return blankSprite; + } + return emptyIcon; + } + + /* Animations */ + @Override + public void registerPartPaths (int index, String[] location) + { + headStrings.put(index, location[0]); + //brokenHeadStrings.put(index, location[1]); + //handleStrings.put(index, location[2]); + if (location.length > 3) + accessoryStrings.put(index, location[3]); + if (location.length > 4) + extraStrings.put(index, location[4]); + } + + @Override + public void registerAlternatePartPaths(int index, String[] location) + { + brokenPartStrings.put(index, location[1]); + handleStrings.put(index, location[2]); + } + + public Icon arrow1; + public Icon arrow2; + public Icon arrow3; + + public HashMap headIcons1 = new HashMap(); + public HashMap handleIcons1 = new HashMap(); + public HashMap accessoryIcons1 = new HashMap(); + public HashMap extraIcons1 = new HashMap(); + public HashMap effectIcons1 = new HashMap(); + + public HashMap headIcons2 = new HashMap(); + public HashMap handleIcons2 = new HashMap(); + public HashMap accessoryIcons2 = new HashMap(); + public HashMap extraIcons2 = new HashMap(); + public HashMap effectIcons2 = new HashMap(); + + public HashMap headIcons3 = new HashMap(); + public HashMap handleIcons3 = new HashMap(); + public HashMap accessoryIcons3 = new HashMap(); + public HashMap extraIcons3 = new HashMap(); + public HashMap effectIcons3 = new HashMap(); + + @Override + public Icon getIcon (ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) + { + int useTime = stack.getMaxItemUseDuration() - useRemaining; + if (!stack.hasTagCompound()) + return emptyIcon; + + NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); + int drawTime = toolTag.getInteger("DrawSpeed"); + float flightSpeed = toolTag.getFloat("FlightSpeed"); + drawTime *= flightSpeed; + if (useTime >= drawTime - 2) + { + return getIcon3(stack, renderPass); + } + if (useTime >= (drawTime * 3 / 5)) + { + return getIcon2(stack, renderPass); + } + return getIcon1(stack, renderPass); + } + + public Icon getIcon1 (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound(); + + if (tags != null) + { + tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (renderPass < getPartAmount()) + { + if (renderPass == 0) // Handle + { + return handleIcons1.get(tags.getInteger("RenderHandle")); + } + + else if (renderPass == 1) // Head + { + return (headIcons1.get(tags.getInteger("RenderHead"))); + } + + else if (renderPass == 2) // Accessory + { + return (accessoryIcons1.get(tags.getInteger("RenderAccessory"))); + } + + else if (renderPass == 3) // Extra + { + return (extraIcons1.get(tags.getInteger("RenderExtra"))); + } + } + + else + { + if (renderPass == getPartAmount()) + { + if (tags.hasKey("Effect1")) + return (effectIcons1.get(tags.getInteger("Effect1"))); + } + + else if (renderPass == getPartAmount() + 1) + { + if (tags.hasKey("Effect2")) + return (effectIcons1.get(tags.getInteger("Effect2"))); + } + + else if (renderPass == getPartAmount() + 2) + { + if (tags.hasKey("Effect3")) + return (effectIcons1.get(tags.getInteger("Effect3"))); + } + + else if (renderPass == getPartAmount() + 3) + { + if (tags.hasKey("Effect4")) + return (effectIcons1.get(tags.getInteger("Effect4"))); + } + + else if (renderPass == getPartAmount() + 4) + { + if (tags.hasKey("Effect5")) + return (effectIcons1.get(tags.getInteger("Effect5"))); + } + + else if (renderPass == getPartAmount() + 5) + { + if (tags.hasKey("Effect6")) + return (effectIcons1.get(tags.getInteger("Effect6"))); + } + else + { + return arrow1; + } + } + return blankSprite; + } + return emptyIcon; + } + + public Icon getIcon2 (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound(); + + if (tags != null) + { + tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (renderPass < getPartAmount()) + { + if (renderPass == 0) // Handle + { + return handleIcons2.get(tags.getInteger("RenderHandle")); + } + + else if (renderPass == 1) // Head + { + return (headIcons2.get(tags.getInteger("RenderHead"))); + } + + else if (renderPass == 2) // Accessory + { + return (accessoryIcons2.get(tags.getInteger("RenderAccessory"))); + } + + else if (renderPass == 3) // Extra + { + return (extraIcons2.get(tags.getInteger("RenderExtra"))); + } + } + + else + { + if (renderPass == getPartAmount()) + { + if (tags.hasKey("Effect1")) + return (effectIcons2.get(tags.getInteger("Effect1"))); + } + + else if (renderPass == getPartAmount() + 1) + { + if (tags.hasKey("Effect2")) + return (effectIcons2.get(tags.getInteger("Effect2"))); + } + + else if (renderPass == getPartAmount() + 2) + { + if (tags.hasKey("Effect3")) + return (effectIcons2.get(tags.getInteger("Effect3"))); + } + + else if (renderPass == getPartAmount() + 3) + { + if (tags.hasKey("Effect4")) + return (effectIcons2.get(tags.getInteger("Effect4"))); + } + + else if (renderPass == getPartAmount() + 4) + { + if (tags.hasKey("Effect5")) + return (effectIcons2.get(tags.getInteger("Effect5"))); + } + + else if (renderPass == getPartAmount() + 5) + { + if (tags.hasKey("Effect6")) + return (effectIcons2.get(tags.getInteger("Effect6"))); + } + else + { + return arrow2; + } + } + return blankSprite; + } + return emptyIcon; + } + + public Icon getIcon3 (ItemStack stack, int renderPass) + { + NBTTagCompound tags = stack.getTagCompound(); + + if (tags != null) + { + tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (renderPass < getPartAmount()) + { + if (renderPass == 0) // Handle + { + return handleIcons3.get(tags.getInteger("RenderHandle")); + } + + else if (renderPass == 1) // Head + { + return (headIcons3.get(tags.getInteger("RenderHead"))); + } + + else if (renderPass == 2) // Accessory + { + return (accessoryIcons3.get(tags.getInteger("RenderAccessory"))); + } + + else if (renderPass == 3) // Extra + { + return (extraIcons3.get(tags.getInteger("RenderExtra"))); + } + } + + else + { + if (renderPass == getPartAmount()) + { + if (tags.hasKey("Effect1")) + return (effectIcons3.get(tags.getInteger("Effect1"))); + } + + else if (renderPass == getPartAmount() + 1) + { + if (tags.hasKey("Effect2")) + return (effectIcons3.get(tags.getInteger("Effect2"))); + } + + else if (renderPass == getPartAmount() + 2) + { + if (tags.hasKey("Effect3")) + return (effectIcons3.get(tags.getInteger("Effect3"))); + } + + else if (renderPass == getPartAmount() + 3) + { + if (tags.hasKey("Effect4")) + return (effectIcons3.get(tags.getInteger("Effect4"))); + } + + else if (renderPass == getPartAmount() + 4) + { + if (tags.hasKey("Effect5")) + return (effectIcons3.get(tags.getInteger("Effect5"))); + } + + else if (renderPass == getPartAmount() + 5) + { + if (tags.hasKey("Effect6")) + return (effectIcons3.get(tags.getInteger("Effect6"))); + } + else + { + return arrow3; + } + } + return blankSprite; + } + return emptyIcon; + } + + @Override + public void buildTool (int id, String name, List list) + { + Item accessory = getAccessoryItem(); + ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, id) : null; + Item extra = getExtraItem(); + ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, id) : null; + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName()); + if (tool == null) + { + System.out.println("Creative builder failed tool for " + name + this.getToolName()); + System.out.println("Make sure you do not have item ID conflicts"); + } + else + { + tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); + list.add(tool); + } + } +} diff --git a/mods/tinker/tconstruct/library/tools/BowMaterial.java b/mods/tinker/tconstruct/library/tools/BowMaterial.java new file mode 100644 index 00000000..d134b2c9 --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/BowMaterial.java @@ -0,0 +1,15 @@ +package mods.tinker.tconstruct.library.tools; + +public class BowMaterial +{ + public final int durability; + public final int drawspeed; + public final float flightSpeedMax; + + public BowMaterial(int durability, int drawspeed, float attack) + { + this.durability = durability; + this.drawspeed = drawspeed; + this.flightSpeedMax = attack; + } +} diff --git a/mods/tinker/tconstruct/library/tools/BowstringMaterial.java b/mods/tinker/tconstruct/library/tools/BowstringMaterial.java new file mode 100644 index 00000000..97ead7ae --- /dev/null +++ b/mods/tinker/tconstruct/library/tools/BowstringMaterial.java @@ -0,0 +1,23 @@ +package mods.tinker.tconstruct.library.tools; + +import net.minecraft.item.ItemStack; + +public class BowstringMaterial +{ + public final int materialID; + public final ItemStack input; + public final ItemStack craftingItem; + public final float durabilityModifier; + public final float drawspeedModifier; + public final float flightSpeedModifier; + + public BowstringMaterial(int materialID, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed) + { + this.materialID = materialID; + this.input = input; + this.craftingItem = craftingItem; + this.durabilityModifier = durability; + this.drawspeedModifier = drawspeed; + this.flightSpeedModifier = flightspeed; + } +} diff --git a/mods/tinker/tconstruct/library/tools/DualHarvestTool.java b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java index ae708fba..0da62ba4 100644 --- a/mods/tinker/tconstruct/library/tools/DualHarvestTool.java +++ b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java @@ -19,12 +19,6 @@ public abstract class DualHarvestTool extends HarvestTool super(itemID, baseDamage); } - @Override - public int getHeadType () - { - return 3; - } - @Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java index 4aea0526..5f3008be 100644 --- a/mods/tinker/tconstruct/library/tools/ToolCore.java +++ b/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -73,16 +73,10 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox canRepair = false; } - @Deprecated - public int getHeadType () - { - return 0; - } - /** Determines crafting behavior with regards to durability * 0: None * 1: Adds handle modifier - * 2: Averages part with the rest of the tool + * 2: Averages part with the rest of the tool (head) * @return type */ @@ -122,7 +116,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox //Not liking this public HashMap headStrings = new HashMap(); - public HashMap brokenHeadStrings = new HashMap(); + public HashMap brokenPartStrings = new HashMap(); public HashMap handleStrings = new HashMap(); public HashMap accessoryStrings = new HashMap(); public HashMap effectStrings = new HashMap(); @@ -157,13 +151,19 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox public void registerPartPaths (int index, String[] location) { headStrings.put(index, location[0]); - brokenHeadStrings.put(index, location[1]); + brokenPartStrings.put(index, location[1]); handleStrings.put(index, location[2]); if (location.length > 3) accessoryStrings.put(index, location[3]); if (location.length > 4) extraStrings.put(index, location[4]); } + + + public void registerAlternatePartPaths (int index, String[] location) + { + + } public void registerEffectPath (int index, String location) { @@ -177,6 +177,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox brokenIcons.clear(); handleIcons.clear(); accessoryIcons.clear(); + extraIcons.clear(); effectIcons.clear(); Iterator iter = headStrings.entrySet().iterator(); while (iter.hasNext()) @@ -185,7 +186,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox headIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); } - iter = brokenHeadStrings.entrySet().iterator(); + iter = brokenPartStrings.entrySet().iterator(); while (iter.hasNext()) { Map.Entry pairs = (Map.Entry) iter.next(); diff --git a/mods/tinker/tconstruct/library/tools/ToolMaterial.java b/mods/tinker/tconstruct/library/tools/ToolMaterial.java index d0ee6ae2..fc51a9a9 100644 --- a/mods/tinker/tconstruct/library/tools/ToolMaterial.java +++ b/mods/tinker/tconstruct/library/tools/ToolMaterial.java @@ -26,7 +26,7 @@ public class ToolMaterial public ToolMaterial(String name, String displayName, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, String ability) { this.materialName = name; - this.displayName = name + " "; + this.displayName = displayName; this.harvestLevel = level; this.durability = durability; this.miningspeed = speed; diff --git a/mods/tinker/tconstruct/library/tools/Weapon.java b/mods/tinker/tconstruct/library/tools/Weapon.java index 613b8d92..043819cc 100644 --- a/mods/tinker/tconstruct/library/tools/Weapon.java +++ b/mods/tinker/tconstruct/library/tools/Weapon.java @@ -89,12 +89,6 @@ public abstract class Weapon extends ToolCore return web; } - @Override - public int getHeadType () - { - return 1; - } - /*@Override public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) { diff --git a/mods/tinker/tconstruct/modifiers/ModLapis.java b/mods/tinker/tconstruct/modifiers/ModLapis.java index 0cc9e7f4..4bac944e 100644 --- a/mods/tinker/tconstruct/modifiers/ModLapis.java +++ b/mods/tinker/tconstruct/modifiers/ModLapis.java @@ -92,7 +92,7 @@ public class ModLapis extends ToolMod updateModTag(tool, keyPair); } - public void midStreamModify (ItemStack tool) + public void midStreamModify (ItemStack tool, ToolCore toolItem) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); if (!tags.hasKey(key)) @@ -109,7 +109,9 @@ public class ModLapis extends ToolMod updateModTag(tool, keyPair); } - if (tool.getItem() instanceof Weapon) + List list = Arrays.asList(toolItem.toolCategories()); + //return list.contains("weapon") || list.contains("harvest"); + if (list.contains("weapon")) { if (keyPair[0] >= 350) { @@ -130,7 +132,8 @@ public class ModLapis extends ToolMod addEnchantment(tool, Enchantment.looting, 1); } } - else + + if (list.contains("harvest")) { if (keyPair[0] >= 350) { diff --git a/mods/tinker/tconstruct/modifiers/ModRedstone.java b/mods/tinker/tconstruct/modifiers/ModRedstone.java index f8af1831..7ee4723c 100644 --- a/mods/tinker/tconstruct/modifiers/ModRedstone.java +++ b/mods/tinker/tconstruct/modifiers/ModRedstone.java @@ -49,9 +49,10 @@ public class ModRedstone extends ToolMod public void modify (ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + int[] keyPair; if (tags.hasKey(key)) { - int[] keyPair = tags.getIntArray(key); + keyPair = tags.getIntArray(key); if (keyPair[0] % max == 0) { keyPair[0] += increase; @@ -76,7 +77,7 @@ public class ModRedstone extends ToolMod tags.setInteger("Modifiers", modifiers); String modName = "\u00a74Redstone ("+increase+"/"+max+")"; int tooltipIndex = addToolTip(tool, tooltipName, modName); - int[] keyPair = new int[] { increase, max, tooltipIndex }; + keyPair = new int[] { increase, max, tooltipIndex }; tags.setIntArray(key, keyPair); } @@ -90,6 +91,14 @@ public class ModRedstone extends ToolMod miningSpeed2 += (increase*8); tags.setInteger("MiningSpeed2", miningSpeed2); } + + if (tags.hasKey("DrawSpeed")) + { + //int drawSpeed = tags.getInteger("DrawSpeed"); + int baseDrawSpeed = tags.getInteger("BaseDrawSpeed"); + int drawSpeed = (int) (baseDrawSpeed - (0.1f * baseDrawSpeed * (keyPair[0] / 50f) )); + tags.setInteger("DrawSpeed", drawSpeed); + } } void updateModTag(ItemStack tool, int[] keys) @@ -103,6 +112,6 @@ public class ModRedstone extends ToolMod public boolean validType(ToolCore tool) { List list = Arrays.asList(tool.toolCategories()); - return list.contains("harvest") || list.contains("utility"); + return list.contains("harvest") || list.contains("utility") || list.contains("bow"); } } diff --git a/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java b/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java index 9f74aab3..c8d06c4d 100644 --- a/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java +++ b/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java @@ -1,5 +1,7 @@ package mods.tinker.tconstruct.modifiers; +import java.util.Arrays; +import java.util.List; import java.util.Random; import mods.tinker.tconstruct.common.TContent; @@ -55,8 +57,9 @@ public class TActiveOmniMod extends ActiveToolMod if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode) return false; - if (tool instanceof HarvestTool) - TContent.modL.midStreamModify(stack); + List list = Arrays.asList(tool.toolCategories()); + if (list.contains("harvest")) + TContent.modL.midStreamModify(stack, tool); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); World world = entity.worldObj; @@ -152,8 +155,9 @@ public class TActiveOmniMod extends ActiveToolMod @Override public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLiving player, Entity entity) { - if (tool instanceof Weapon) - TContent.modL.midStreamModify(stack); + List list = Arrays.asList(tool.toolCategories()); + if (list.contains("weapon")) + TContent.modL.midStreamModify(stack, tool); return 0; } diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java index 5445ae55..65bbf8a0 100644 --- a/mods/tinker/tconstruct/util/PHConstruct.java +++ b/mods/tinker/tconstruct/util/PHConstruct.java @@ -10,16 +10,17 @@ import net.minecraftforge.common.Configuration; public class PHConstruct { - public static void initProps () + public static void initProps (File location) { /* Here we will set up the config file for the mod * First: Create a folder inside the config folder * Second: Create the actual config file * Note: Configs are a pain, but absolutely necessary for every mod. */ - File file = new File(TConstruct.proxy.getLocation() + "/config"); - file.mkdir(); - File newFile = new File(TConstruct.proxy.getLocation() + "/config/TinkersWorkshop.txt"); + //File file = new File(TConstruct.proxy.getLocation() + "/config"); + //file.mkdir(); + //File newFile = new File(TConstruct.proxy.getLocation() + "/config/TinkersWorkshop.txt"); + File newFile = new File(location + "/TinkersWorkshop.txt"); /* Some basic debugging will go a long way */ try @@ -98,6 +99,8 @@ public class PHConstruct stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225); redstoneMachine = config.getBlock("Redstone Machines", 3226).getInt(3226); dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227); + glassPane = config.getBlock("Glass Pane", 3228).getInt(3228); + stainedGlassClearPane = config.getBlock("Clear Stained Glass Pane", 3229).getInt(3229); /*golemCore = config.getBlock("Golem Core", 1481).getInt(1481); golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/ @@ -138,6 +141,7 @@ public class PHConstruct excavatorHead = config.getItem("Tool Parts", "Excavator Head", 14045).getInt(14045); hammerHead = config.getItem("Tool Parts", "Hammer Head", 14046).getInt(14046); fullGuard = config.getItem("Tool Parts", "Full Guard", 14047).getInt(14047); + bowstring = config.getItem("Tool Parts", "Bowstring", 14048).getInt(14048); pickaxe = config.getItem("Tools", "Pickaxe", 14051).getInt(14051); shovel = config.getItem("Tools", "Shovel", 14052).getInt(14052); @@ -314,8 +318,10 @@ public class PHConstruct //InfiBlocks public static int speedBlock; public static int glass; + public static int glassPane; public static int stainedGlass; public static int stainedGlassClear; + public static int stainedGlassClearPane; //Crystalline public static int aggregator; @@ -404,6 +410,8 @@ public class PHConstruct public static int toughRod; public static int largePlate; + public static int bowstring; + //Wearables public static int heavyHelmet; public static int heavyChestplate; diff --git a/mods/tinker/tconstruct/util/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java index 10cf03ae..5726f301 100644 --- a/mods/tinker/tconstruct/util/TEventHandler.java +++ b/mods/tinker/tconstruct/util/TEventHandler.java @@ -7,10 +7,14 @@ import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.crystal.TheftValueTracker; +import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.crafting.PatternBuilder; import mods.tinker.tconstruct.library.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.event.PartBuilderEvent; import mods.tinker.tconstruct.library.event.ToolCraftEvent; +import mods.tinker.tconstruct.library.tools.BowMaterial; +import mods.tinker.tconstruct.library.tools.BowstringMaterial; import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.util.ValueCoordTuple; import mods.tinker.tconstruct.modifiers.ModAttack; @@ -51,7 +55,7 @@ public class TEventHandler /* Crafting */ @ForgeSubscribe - public void craftTool (ToolCraftEvent event) + public void craftTool (ToolCraftEvent.NormalTool event) { NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool"); int thaum = 0; @@ -64,7 +68,7 @@ public class TEventHandler if (toolTag.getInteger("Extra") == 31) thaum++; - if ( (thaum >= 3) || (!toolTag.hasKey("Accessory") && thaum >= 2) ) + if ((thaum >= 3) || (!toolTag.hasKey("Accessory") && thaum >= 2)) { int modifiers = toolTag.getInteger("Modifiers"); modifiers += 2; @@ -76,6 +80,45 @@ public class TEventHandler modifiers += 1; toolTag.setInteger("Modifiers", modifiers); } + + if (event.tool == TContent.shortbow) + { + BowMaterial top = TConstructRegistry.getBowMaterial(toolTag.getInteger("Head")); + BowMaterial bottom = TConstructRegistry.getBowMaterial(toolTag.getInteger("Accessory")); + BowstringMaterial string = TConstructRegistry.getBowstringMaterial(toolTag.getInteger("Handle")); + + if (toolTag.getInteger("Handle") == 1) + { + int modifiers = toolTag.getInteger("Modifiers"); + modifiers += 1; + toolTag.setInteger("Modifiers", modifiers); + } + + int durability = (int) ((top.durability + bottom.durability) / 2 * string.durabilityModifier); + toolTag.setInteger("TotalDurability", durability); + toolTag.setInteger("BaseDurability", durability); + + int drawSpeed = (int) ((top.drawspeed + bottom.drawspeed) / 2 * string.drawspeedModifier); + toolTag.setInteger("DrawSpeed", drawSpeed); + toolTag.setInteger("BaseDrawSpeed", drawSpeed); + + float flightSpeed = (top.flightSpeedMax + bottom.flightSpeedMax) / 2f * string.flightSpeedModifier; + toolTag.setFloat("FlightSpeed", flightSpeed); + } + } + + @ForgeSubscribe + public void craftPart (PartBuilderEvent.NormalPart event) + { + if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 23) + { + //System.out.println("Fire! "); + ItemStack result = TConstructRegistry.craftBowString(event.material); + if (result != null) + { + event.overrideResult(new ItemStack[] { result, null }); + } + } } /* Interact */ diff --git a/mods/tinker/textures/gui/icons.png b/mods/tinker/textures/gui/icons.png index b7397567..7f058d4f 100644 Binary files a/mods/tinker/textures/gui/icons.png and b/mods/tinker/textures/gui/icons.png differ diff --git a/mods/tinker/textures/items/armor/quiver.png b/mods/tinker/textures/items/armor/quiver.png new file mode 100644 index 00000000..818f7283 Binary files /dev/null and b/mods/tinker/textures/items/armor/quiver.png differ diff --git a/mods/tinker/textures/items/materials/cast_bowstring.png b/mods/tinker/textures/items/materials/cast_bowstring.png new file mode 100644 index 00000000..3b0fc0a9 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_bowstring.png differ diff --git a/mods/tinker/textures/items/materials/cast_jewel.png b/mods/tinker/textures/items/materials/cast_jewel.png deleted file mode 100644 index a05b2e8a..00000000 Binary files a/mods/tinker/textures/items/materials/cast_jewel.png and /dev/null differ diff --git a/mods/tinker/textures/items/materials/pattern_bowstring.png b/mods/tinker/textures/items/materials/pattern_bowstring.png new file mode 100644 index 00000000..d30ac437 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_bowstring.png differ diff --git a/mods/tinker/textures/items/parts/magicfabric_bowstring.png b/mods/tinker/textures/items/parts/magicfabric_bowstring.png new file mode 100644 index 00000000..5996d0b4 Binary files /dev/null and b/mods/tinker/textures/items/parts/magicfabric_bowstring.png differ diff --git a/mods/tinker/textures/items/parts/string_bowstring.png b/mods/tinker/textures/items/parts/string_bowstring.png new file mode 100644 index 00000000..1df20778 Binary files /dev/null and b/mods/tinker/textures/items/parts/string_bowstring.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_bottom.png b/mods/tinker/textures/items/shortbow/alumite_bow_bottom.png new file mode 100644 index 00000000..203a8de6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_1.png new file mode 100644 index 00000000..203a8de6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_2.png new file mode 100644 index 00000000..0415766b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_3.png new file mode 100644 index 00000000..20524aa8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_top.png b/mods/tinker/textures/items/shortbow/alumite_bow_top.png new file mode 100644 index 00000000..414f8fa3 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_top_1.png b/mods/tinker/textures/items/shortbow/alumite_bow_top_1.png new file mode 100644 index 00000000..414f8fa3 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_top_2.png b/mods/tinker/textures/items/shortbow/alumite_bow_top_2.png new file mode 100644 index 00000000..29d3325b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/alumite_bow_top_3.png b/mods/tinker/textures/items/shortbow/alumite_bow_top_3.png new file mode 100644 index 00000000..012d9b2d Binary files /dev/null and b/mods/tinker/textures/items/shortbow/alumite_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_bottom.png b/mods/tinker/textures/items/shortbow/ardite_bow_bottom.png new file mode 100644 index 00000000..35216238 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_1.png new file mode 100644 index 00000000..35216238 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_2.png new file mode 100644 index 00000000..9a1d63a8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_3.png new file mode 100644 index 00000000..5385afe0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_top.png b/mods/tinker/textures/items/shortbow/ardite_bow_top.png new file mode 100644 index 00000000..af3129c0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_top_1.png b/mods/tinker/textures/items/shortbow/ardite_bow_top_1.png new file mode 100644 index 00000000..af3129c0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_top_2.png b/mods/tinker/textures/items/shortbow/ardite_bow_top_2.png new file mode 100644 index 00000000..56c15cf9 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/ardite_bow_top_3.png b/mods/tinker/textures/items/shortbow/ardite_bow_top_3.png new file mode 100644 index 00000000..2a9966d8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ardite_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/arrow_1.png b/mods/tinker/textures/items/shortbow/arrow_1.png new file mode 100644 index 00000000..c1d3a4d6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/arrow_1.png differ diff --git a/mods/tinker/textures/items/shortbow/arrow_2.png b/mods/tinker/textures/items/shortbow/arrow_2.png new file mode 100644 index 00000000..85ab8174 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/arrow_2.png differ diff --git a/mods/tinker/textures/items/shortbow/arrow_3.png b/mods/tinker/textures/items/shortbow/arrow_3.png new file mode 100644 index 00000000..ccbcf63f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/arrow_3.png differ diff --git a/mods/tinker/textures/items/shortbow/beheading_bow_effect.png b/mods/tinker/textures/items/shortbow/beheading_bow_effect.png new file mode 100644 index 00000000..440a4306 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/beheading_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/beheading_bow_effect_1.png b/mods/tinker/textures/items/shortbow/beheading_bow_effect_1.png new file mode 100644 index 00000000..440a4306 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/beheading_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/beheading_bow_effect_2.png b/mods/tinker/textures/items/shortbow/beheading_bow_effect_2.png new file mode 100644 index 00000000..440a4306 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/beheading_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/beheading_bow_effect_3.png b/mods/tinker/textures/items/shortbow/beheading_bow_effect_3.png new file mode 100644 index 00000000..440a4306 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/beheading_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/blaze_bow_effect.png b/mods/tinker/textures/items/shortbow/blaze_bow_effect.png new file mode 100644 index 00000000..32f42943 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blaze_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/blaze_bow_effect_1.png b/mods/tinker/textures/items/shortbow/blaze_bow_effect_1.png new file mode 100644 index 00000000..32f42943 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blaze_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/blaze_bow_effect_2.png b/mods/tinker/textures/items/shortbow/blaze_bow_effect_2.png new file mode 100644 index 00000000..dbb350ac Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blaze_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/blaze_bow_effect_3.png b/mods/tinker/textures/items/shortbow/blaze_bow_effect_3.png new file mode 100644 index 00000000..92019bcb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blaze_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_bottom.png b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom.png new file mode 100644 index 00000000..d7ae0ad2 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_1.png new file mode 100644 index 00000000..d7ae0ad2 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_2.png new file mode 100644 index 00000000..a8889cb8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_3.png new file mode 100644 index 00000000..3d081b66 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_top.png b/mods/tinker/textures/items/shortbow/blueslime_bow_top.png new file mode 100644 index 00000000..aec86276 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_top_1.png b/mods/tinker/textures/items/shortbow/blueslime_bow_top_1.png new file mode 100644 index 00000000..aec86276 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_top_2.png b/mods/tinker/textures/items/shortbow/blueslime_bow_top_2.png new file mode 100644 index 00000000..81c01ea8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/blueslime_bow_top_3.png b/mods/tinker/textures/items/shortbow/blueslime_bow_top_3.png new file mode 100644 index 00000000..a31f926e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/blueslime_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_bottom.png b/mods/tinker/textures/items/shortbow/bone_bow_bottom.png new file mode 100644 index 00000000..dc3756eb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/bone_bow_bottom_1.png new file mode 100644 index 00000000..dc3756eb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/bone_bow_bottom_2.png new file mode 100644 index 00000000..661ed25b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/bone_bow_bottom_3.png new file mode 100644 index 00000000..a564f4f8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_top.png b/mods/tinker/textures/items/shortbow/bone_bow_top.png new file mode 100644 index 00000000..f98e6aaa Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_top_1.png b/mods/tinker/textures/items/shortbow/bone_bow_top_1.png new file mode 100644 index 00000000..f98e6aaa Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_top_2.png b/mods/tinker/textures/items/shortbow/bone_bow_top_2.png new file mode 100644 index 00000000..10fa7e0b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/bone_bow_top_3.png b/mods/tinker/textures/items/shortbow/bone_bow_top_3.png new file mode 100644 index 00000000..1738259b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bone_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_bottom.png b/mods/tinker/textures/items/shortbow/bronze_bow_bottom.png new file mode 100644 index 00000000..3f49ddc1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_1.png new file mode 100644 index 00000000..3f49ddc1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_2.png new file mode 100644 index 00000000..3cc24e60 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_3.png new file mode 100644 index 00000000..0cfae90a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_top.png b/mods/tinker/textures/items/shortbow/bronze_bow_top.png new file mode 100644 index 00000000..31a3a8fd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_top_1.png b/mods/tinker/textures/items/shortbow/bronze_bow_top_1.png new file mode 100644 index 00000000..31a3a8fd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_top_2.png b/mods/tinker/textures/items/shortbow/bronze_bow_top_2.png new file mode 100644 index 00000000..2feded05 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/bronze_bow_top_3.png b/mods/tinker/textures/items/shortbow/bronze_bow_top_3.png new file mode 100644 index 00000000..d7f3278e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/bronze_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_bottom.png b/mods/tinker/textures/items/shortbow/cactus_bow_bottom.png new file mode 100644 index 00000000..d5fdb240 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_1.png new file mode 100644 index 00000000..d5fdb240 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_2.png new file mode 100644 index 00000000..ffdc2107 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_3.png new file mode 100644 index 00000000..9f847e00 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_top.png b/mods/tinker/textures/items/shortbow/cactus_bow_top.png new file mode 100644 index 00000000..80f9193b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_top_1.png b/mods/tinker/textures/items/shortbow/cactus_bow_top_1.png new file mode 100644 index 00000000..80f9193b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_top_2.png b/mods/tinker/textures/items/shortbow/cactus_bow_top_2.png new file mode 100644 index 00000000..7be9e12a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/cactus_bow_top_3.png b/mods/tinker/textures/items/shortbow/cactus_bow_top_3.png new file mode 100644 index 00000000..4070726b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cactus_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_bottom.png b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom.png new file mode 100644 index 00000000..567fe212 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_1.png new file mode 100644 index 00000000..567fe212 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_2.png new file mode 100644 index 00000000..bf4a2f78 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_3.png new file mode 100644 index 00000000..48bfd6f7 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_top.png b/mods/tinker/textures/items/shortbow/cobalt_bow_top.png new file mode 100644 index 00000000..48652ed3 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_top_1.png b/mods/tinker/textures/items/shortbow/cobalt_bow_top_1.png new file mode 100644 index 00000000..48652ed3 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_top_2.png b/mods/tinker/textures/items/shortbow/cobalt_bow_top_2.png new file mode 100644 index 00000000..30965baa Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/cobalt_bow_top_3.png b/mods/tinker/textures/items/shortbow/cobalt_bow_top_3.png new file mode 100644 index 00000000..5401d8e4 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/cobalt_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_bottom.png b/mods/tinker/textures/items/shortbow/copper_bow_bottom.png new file mode 100644 index 00000000..8928394a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/copper_bow_bottom_1.png new file mode 100644 index 00000000..8928394a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/copper_bow_bottom_2.png new file mode 100644 index 00000000..499df3c1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/copper_bow_bottom_3.png new file mode 100644 index 00000000..5f5201db Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_top.png b/mods/tinker/textures/items/shortbow/copper_bow_top.png new file mode 100644 index 00000000..0c258c94 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_top_1.png b/mods/tinker/textures/items/shortbow/copper_bow_top_1.png new file mode 100644 index 00000000..0c258c94 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_top_2.png b/mods/tinker/textures/items/shortbow/copper_bow_top_2.png new file mode 100644 index 00000000..c0e9ef28 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/copper_bow_top_3.png b/mods/tinker/textures/items/shortbow/copper_bow_top_3.png new file mode 100644 index 00000000..37c1e7fb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/copper_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/diamond_bow_effect.png b/mods/tinker/textures/items/shortbow/diamond_bow_effect.png new file mode 100644 index 00000000..8e818f54 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/diamond_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/diamond_bow_effect_1.png b/mods/tinker/textures/items/shortbow/diamond_bow_effect_1.png new file mode 100644 index 00000000..8e818f54 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/diamond_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/diamond_bow_effect_2.png b/mods/tinker/textures/items/shortbow/diamond_bow_effect_2.png new file mode 100644 index 00000000..8e818f54 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/diamond_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/diamond_bow_effect_3.png b/mods/tinker/textures/items/shortbow/diamond_bow_effect_3.png new file mode 100644 index 00000000..8e818f54 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/diamond_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/electric_bow_effect.png b/mods/tinker/textures/items/shortbow/electric_bow_effect.png new file mode 100644 index 00000000..89bc383f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/electric_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/electric_bow_effect_1.png b/mods/tinker/textures/items/shortbow/electric_bow_effect_1.png new file mode 100644 index 00000000..89bc383f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/electric_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/electric_bow_effect_2.png b/mods/tinker/textures/items/shortbow/electric_bow_effect_2.png new file mode 100644 index 00000000..89bc383f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/electric_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/electric_bow_effect_3.png b/mods/tinker/textures/items/shortbow/electric_bow_effect_3.png new file mode 100644 index 00000000..41acfc3e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/electric_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/emerald_bow_effect.png b/mods/tinker/textures/items/shortbow/emerald_bow_effect.png new file mode 100644 index 00000000..fedf64cb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/emerald_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/emerald_bow_effect_1.png b/mods/tinker/textures/items/shortbow/emerald_bow_effect_1.png new file mode 100644 index 00000000..fedf64cb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/emerald_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/emerald_bow_effect_2.png b/mods/tinker/textures/items/shortbow/emerald_bow_effect_2.png new file mode 100644 index 00000000..fedf64cb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/emerald_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/emerald_bow_effect_3.png b/mods/tinker/textures/items/shortbow/emerald_bow_effect_3.png new file mode 100644 index 00000000..fedf64cb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/emerald_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_bottom.png b/mods/tinker/textures/items/shortbow/flint_bow_bottom.png new file mode 100644 index 00000000..e8486744 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/flint_bow_bottom_1.png new file mode 100644 index 00000000..e8486744 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/flint_bow_bottom_2.png new file mode 100644 index 00000000..238bc963 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/flint_bow_bottom_3.png new file mode 100644 index 00000000..a67eb39b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_top.png b/mods/tinker/textures/items/shortbow/flint_bow_top.png new file mode 100644 index 00000000..98a0f654 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_top_1.png b/mods/tinker/textures/items/shortbow/flint_bow_top_1.png new file mode 100644 index 00000000..98a0f654 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_top_2.png b/mods/tinker/textures/items/shortbow/flint_bow_top_2.png new file mode 100644 index 00000000..7d154de1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/flint_bow_top_3.png b/mods/tinker/textures/items/shortbow/flint_bow_top_3.png new file mode 100644 index 00000000..c86826ed Binary files /dev/null and b/mods/tinker/textures/items/shortbow/flint_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/ice_bow_effect.png b/mods/tinker/textures/items/shortbow/ice_bow_effect.png new file mode 100644 index 00000000..1b950f37 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ice_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/ice_bow_effect_1.png b/mods/tinker/textures/items/shortbow/ice_bow_effect_1.png new file mode 100644 index 00000000..1b950f37 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ice_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/ice_bow_effect_2.png b/mods/tinker/textures/items/shortbow/ice_bow_effect_2.png new file mode 100644 index 00000000..bde2464b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ice_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/ice_bow_effect_3.png b/mods/tinker/textures/items/shortbow/ice_bow_effect_3.png new file mode 100644 index 00000000..bde2464b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/ice_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_bottom.png b/mods/tinker/textures/items/shortbow/iron_bow_bottom.png new file mode 100644 index 00000000..d32a9cd6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/iron_bow_bottom_1.png new file mode 100644 index 00000000..d32a9cd6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/iron_bow_bottom_2.png new file mode 100644 index 00000000..559c9ebb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/iron_bow_bottom_3.png new file mode 100644 index 00000000..fc5564d2 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_top.png b/mods/tinker/textures/items/shortbow/iron_bow_top.png new file mode 100644 index 00000000..bb382d86 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_top_1.png b/mods/tinker/textures/items/shortbow/iron_bow_top_1.png new file mode 100644 index 00000000..bb382d86 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_top_2.png b/mods/tinker/textures/items/shortbow/iron_bow_top_2.png new file mode 100644 index 00000000..a1cb0153 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/iron_bow_top_3.png b/mods/tinker/textures/items/shortbow/iron_bow_top_3.png new file mode 100644 index 00000000..8e514166 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/iron_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/lapis_bow_effect.png b/mods/tinker/textures/items/shortbow/lapis_bow_effect.png new file mode 100644 index 00000000..28e38ff8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lapis_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/lapis_bow_effect_1.png b/mods/tinker/textures/items/shortbow/lapis_bow_effect_1.png new file mode 100644 index 00000000..28e38ff8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lapis_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/lapis_bow_effect_2.png b/mods/tinker/textures/items/shortbow/lapis_bow_effect_2.png new file mode 100644 index 00000000..28e38ff8 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lapis_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/lapis_bow_effect_3.png b/mods/tinker/textures/items/shortbow/lapis_bow_effect_3.png new file mode 100644 index 00000000..1a125fdd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lapis_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/lava_bow_effect.png b/mods/tinker/textures/items/shortbow/lava_bow_effect.png new file mode 100644 index 00000000..d45a0fe0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lava_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/lava_bow_effect_1.png b/mods/tinker/textures/items/shortbow/lava_bow_effect_1.png new file mode 100644 index 00000000..d45a0fe0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lava_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/lava_bow_effect_2.png b/mods/tinker/textures/items/shortbow/lava_bow_effect_2.png new file mode 100644 index 00000000..5650ccbe Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lava_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/lava_bow_effect_3.png b/mods/tinker/textures/items/shortbow/lava_bow_effect_3.png new file mode 100644 index 00000000..5650ccbe Binary files /dev/null and b/mods/tinker/textures/items/shortbow/lava_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/magicfabric_bowstring.png b/mods/tinker/textures/items/shortbow/magicfabric_bowstring.png new file mode 100644 index 00000000..3f3f9c0a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/magicfabric_bowstring.png differ diff --git a/mods/tinker/textures/items/shortbow/magicfabric_bowstring_1.png b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_1.png new file mode 100644 index 00000000..ab1f032b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_1.png differ diff --git a/mods/tinker/textures/items/shortbow/magicfabric_bowstring_2.png b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_2.png new file mode 100644 index 00000000..faa3d3fa Binary files /dev/null and b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_2.png differ diff --git a/mods/tinker/textures/items/shortbow/magicfabric_bowstring_3.png b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_3.png new file mode 100644 index 00000000..a6ff7967 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_3.png differ diff --git a/mods/tinker/textures/items/shortbow/magicfabric_bowstring_broken.png b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_broken.png new file mode 100644 index 00000000..a765b045 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/magicfabric_bowstring_broken.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom.png new file mode 100644 index 00000000..7c5f463e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_1.png new file mode 100644 index 00000000..7c5f463e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_2.png new file mode 100644 index 00000000..6f84881f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_3.png new file mode 100644 index 00000000..04bb17be Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_top.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_top.png new file mode 100644 index 00000000..82aa1ffd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_top_1.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_1.png new file mode 100644 index 00000000..82aa1ffd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_top_2.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_2.png new file mode 100644 index 00000000..e622cdda Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/manyullyn_bow_top_3.png b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_3.png new file mode 100644 index 00000000..f6ee5f3c Binary files /dev/null and b/mods/tinker/textures/items/shortbow/manyullyn_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/moss_bow_effect.png b/mods/tinker/textures/items/shortbow/moss_bow_effect.png new file mode 100644 index 00000000..42af1203 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/moss_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/moss_bow_effect_1.png b/mods/tinker/textures/items/shortbow/moss_bow_effect_1.png new file mode 100644 index 00000000..42af1203 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/moss_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/moss_bow_effect_2.png b/mods/tinker/textures/items/shortbow/moss_bow_effect_2.png new file mode 100644 index 00000000..2693dcc9 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/moss_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/moss_bow_effect_3.png b/mods/tinker/textures/items/shortbow/moss_bow_effect_3.png new file mode 100644 index 00000000..66b18ce3 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/moss_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/necrotic_bow_effect.png b/mods/tinker/textures/items/shortbow/necrotic_bow_effect.png new file mode 100644 index 00000000..9e2dcc59 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/necrotic_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/necrotic_bow_effect_1.png b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_1.png new file mode 100644 index 00000000..9e2dcc59 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/necrotic_bow_effect_2.png b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_2.png new file mode 100644 index 00000000..9e2dcc59 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/necrotic_bow_effect_3.png b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_3.png new file mode 100644 index 00000000..9e2dcc59 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/necrotic_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_bottom.png b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom.png new file mode 100644 index 00000000..8dcda37a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_1.png new file mode 100644 index 00000000..8dcda37a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_2.png new file mode 100644 index 00000000..dc122ddf Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_3.png new file mode 100644 index 00000000..537076db Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_top.png b/mods/tinker/textures/items/shortbow/netherrack_bow_top.png new file mode 100644 index 00000000..183081ab Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_top_1.png b/mods/tinker/textures/items/shortbow/netherrack_bow_top_1.png new file mode 100644 index 00000000..183081ab Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_top_2.png b/mods/tinker/textures/items/shortbow/netherrack_bow_top_2.png new file mode 100644 index 00000000..0fb9c2a0 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/netherrack_bow_top_3.png b/mods/tinker/textures/items/shortbow/netherrack_bow_top_3.png new file mode 100644 index 00000000..ebcf5b0f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/netherrack_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_bottom.png b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom.png new file mode 100644 index 00000000..cce2e594 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_1.png new file mode 100644 index 00000000..cce2e594 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_2.png new file mode 100644 index 00000000..8ef3359f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_3.png new file mode 100644 index 00000000..76856ef2 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_top.png b/mods/tinker/textures/items/shortbow/obsidian_bow_top.png new file mode 100644 index 00000000..caa5d18b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_top_1.png b/mods/tinker/textures/items/shortbow/obsidian_bow_top_1.png new file mode 100644 index 00000000..caa5d18b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_top_2.png b/mods/tinker/textures/items/shortbow/obsidian_bow_top_2.png new file mode 100644 index 00000000..29494d39 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/obsidian_bow_top_3.png b/mods/tinker/textures/items/shortbow/obsidian_bow_top_3.png new file mode 100644 index 00000000..932f7523 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/obsidian_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_bottom.png b/mods/tinker/textures/items/shortbow/paper_bow_bottom.png new file mode 100644 index 00000000..b3ac0c86 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/paper_bow_bottom_1.png new file mode 100644 index 00000000..b3ac0c86 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/paper_bow_bottom_2.png new file mode 100644 index 00000000..9f19a8b4 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/paper_bow_bottom_3.png new file mode 100644 index 00000000..0597d6c2 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_top.png b/mods/tinker/textures/items/shortbow/paper_bow_top.png new file mode 100644 index 00000000..7038f3d5 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_top_1.png b/mods/tinker/textures/items/shortbow/paper_bow_top_1.png new file mode 100644 index 00000000..7038f3d5 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_top_2.png b/mods/tinker/textures/items/shortbow/paper_bow_top_2.png new file mode 100644 index 00000000..c46de670 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/paper_bow_top_3.png b/mods/tinker/textures/items/shortbow/paper_bow_top_3.png new file mode 100644 index 00000000..6c490f17 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/paper_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/piston_bow_effect.png b/mods/tinker/textures/items/shortbow/piston_bow_effect.png new file mode 100644 index 00000000..cfaee27f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/piston_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/piston_bow_effect_1.png b/mods/tinker/textures/items/shortbow/piston_bow_effect_1.png new file mode 100644 index 00000000..cfaee27f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/piston_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/piston_bow_effect_2.png b/mods/tinker/textures/items/shortbow/piston_bow_effect_2.png new file mode 100644 index 00000000..cfaee27f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/piston_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/piston_bow_effect_3.png b/mods/tinker/textures/items/shortbow/piston_bow_effect_3.png new file mode 100644 index 00000000..cfaee27f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/piston_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/quartz_bow_effect.png b/mods/tinker/textures/items/shortbow/quartz_bow_effect.png new file mode 100644 index 00000000..861f9944 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/quartz_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/quartz_bow_effect_1.png b/mods/tinker/textures/items/shortbow/quartz_bow_effect_1.png new file mode 100644 index 00000000..861f9944 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/quartz_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/quartz_bow_effect_2.png b/mods/tinker/textures/items/shortbow/quartz_bow_effect_2.png new file mode 100644 index 00000000..4e99eac5 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/quartz_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/quartz_bow_effect_3.png b/mods/tinker/textures/items/shortbow/quartz_bow_effect_3.png new file mode 100644 index 00000000..ab6564e9 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/quartz_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/redstone_bow_effect.png b/mods/tinker/textures/items/shortbow/redstone_bow_effect.png new file mode 100644 index 00000000..ab1281dc Binary files /dev/null and b/mods/tinker/textures/items/shortbow/redstone_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/redstone_bow_effect_1.png b/mods/tinker/textures/items/shortbow/redstone_bow_effect_1.png new file mode 100644 index 00000000..ed6f7f94 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/redstone_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/redstone_bow_effect_2.png b/mods/tinker/textures/items/shortbow/redstone_bow_effect_2.png new file mode 100644 index 00000000..20dc0252 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/redstone_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/redstone_bow_effect_3.png b/mods/tinker/textures/items/shortbow/redstone_bow_effect_3.png new file mode 100644 index 00000000..e7e2ae99 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/redstone_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/reinforced_bow_effect.png b/mods/tinker/textures/items/shortbow/reinforced_bow_effect.png new file mode 100644 index 00000000..96767628 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/reinforced_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/reinforced_bow_effect_1.png b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_1.png new file mode 100644 index 00000000..96767628 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/reinforced_bow_effect_2.png b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_2.png new file mode 100644 index 00000000..96767628 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/reinforced_bow_effect_3.png b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_3.png new file mode 100644 index 00000000..96767628 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/reinforced_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/silk_bow_effect.png b/mods/tinker/textures/items/shortbow/silk_bow_effect.png new file mode 100644 index 00000000..bfc83c8f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/silk_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/silk_bow_effect_1.png b/mods/tinker/textures/items/shortbow/silk_bow_effect_1.png new file mode 100644 index 00000000..bfc83c8f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/silk_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/silk_bow_effect_2.png b/mods/tinker/textures/items/shortbow/silk_bow_effect_2.png new file mode 100644 index 00000000..e62b5a45 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/silk_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/silk_bow_effect_3.png b/mods/tinker/textures/items/shortbow/silk_bow_effect_3.png new file mode 100644 index 00000000..6e5da9bd Binary files /dev/null and b/mods/tinker/textures/items/shortbow/silk_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_bottom.png b/mods/tinker/textures/items/shortbow/slime_bow_bottom.png new file mode 100644 index 00000000..02746278 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/slime_bow_bottom_1.png new file mode 100644 index 00000000..02746278 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/slime_bow_bottom_2.png new file mode 100644 index 00000000..06453f9d Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/slime_bow_bottom_3.png new file mode 100644 index 00000000..a74b8409 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_top.png b/mods/tinker/textures/items/shortbow/slime_bow_top.png new file mode 100644 index 00000000..a3aa62fc Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_top_1.png b/mods/tinker/textures/items/shortbow/slime_bow_top_1.png new file mode 100644 index 00000000..a3aa62fc Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_top_2.png b/mods/tinker/textures/items/shortbow/slime_bow_top_2.png new file mode 100644 index 00000000..5dddf63f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/slime_bow_top_3.png b/mods/tinker/textures/items/shortbow/slime_bow_top_3.png new file mode 100644 index 00000000..56200eec Binary files /dev/null and b/mods/tinker/textures/items/shortbow/slime_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/smite_bow_effect.png b/mods/tinker/textures/items/shortbow/smite_bow_effect.png new file mode 100644 index 00000000..5f771c69 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/smite_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/smite_bow_effect_1.png b/mods/tinker/textures/items/shortbow/smite_bow_effect_1.png new file mode 100644 index 00000000..5f771c69 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/smite_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/smite_bow_effect_2.png b/mods/tinker/textures/items/shortbow/smite_bow_effect_2.png new file mode 100644 index 00000000..5f771c69 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/smite_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/smite_bow_effect_3.png b/mods/tinker/textures/items/shortbow/smite_bow_effect_3.png new file mode 100644 index 00000000..5f771c69 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/smite_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/spider_bow_effect.png b/mods/tinker/textures/items/shortbow/spider_bow_effect.png new file mode 100644 index 00000000..6b12a3c1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/spider_bow_effect.png differ diff --git a/mods/tinker/textures/items/shortbow/spider_bow_effect_1.png b/mods/tinker/textures/items/shortbow/spider_bow_effect_1.png new file mode 100644 index 00000000..6b12a3c1 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/spider_bow_effect_1.png differ diff --git a/mods/tinker/textures/items/shortbow/spider_bow_effect_2.png b/mods/tinker/textures/items/shortbow/spider_bow_effect_2.png new file mode 100644 index 00000000..c474a568 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/spider_bow_effect_2.png differ diff --git a/mods/tinker/textures/items/shortbow/spider_bow_effect_3.png b/mods/tinker/textures/items/shortbow/spider_bow_effect_3.png new file mode 100644 index 00000000..dd07a1f7 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/spider_bow_effect_3.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_bottom.png b/mods/tinker/textures/items/shortbow/steel_bow_bottom.png new file mode 100644 index 00000000..cd5c4937 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/steel_bow_bottom_1.png new file mode 100644 index 00000000..cd5c4937 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/steel_bow_bottom_2.png new file mode 100644 index 00000000..93c8e271 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/steel_bow_bottom_3.png new file mode 100644 index 00000000..411c0010 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_top.png b/mods/tinker/textures/items/shortbow/steel_bow_top.png new file mode 100644 index 00000000..4343bdbb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_top_1.png b/mods/tinker/textures/items/shortbow/steel_bow_top_1.png new file mode 100644 index 00000000..4343bdbb Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_top_2.png b/mods/tinker/textures/items/shortbow/steel_bow_top_2.png new file mode 100644 index 00000000..a10fb72f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/steel_bow_top_3.png b/mods/tinker/textures/items/shortbow/steel_bow_top_3.png new file mode 100644 index 00000000..b2a87f62 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/steel_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_bottom.png b/mods/tinker/textures/items/shortbow/stone_bow_bottom.png new file mode 100644 index 00000000..87a8804b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/stone_bow_bottom_1.png new file mode 100644 index 00000000..87a8804b Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/stone_bow_bottom_2.png new file mode 100644 index 00000000..e986341a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/stone_bow_bottom_3.png new file mode 100644 index 00000000..b316b7f6 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_top.png b/mods/tinker/textures/items/shortbow/stone_bow_top.png new file mode 100644 index 00000000..cfba940f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_top_1.png b/mods/tinker/textures/items/shortbow/stone_bow_top_1.png new file mode 100644 index 00000000..cfba940f Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_top_2.png b/mods/tinker/textures/items/shortbow/stone_bow_top_2.png new file mode 100644 index 00000000..0758268a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/stone_bow_top_3.png b/mods/tinker/textures/items/shortbow/stone_bow_top_3.png new file mode 100644 index 00000000..3d04f53e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/stone_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/string_bowstring.png b/mods/tinker/textures/items/shortbow/string_bowstring.png new file mode 100644 index 00000000..ff07f728 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/string_bowstring.png differ diff --git a/mods/tinker/textures/items/shortbow/string_bowstring_1.png b/mods/tinker/textures/items/shortbow/string_bowstring_1.png new file mode 100644 index 00000000..f7ff4e54 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/string_bowstring_1.png differ diff --git a/mods/tinker/textures/items/shortbow/string_bowstring_2.png b/mods/tinker/textures/items/shortbow/string_bowstring_2.png new file mode 100644 index 00000000..e8ba2a22 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/string_bowstring_2.png differ diff --git a/mods/tinker/textures/items/shortbow/string_bowstring_3.png b/mods/tinker/textures/items/shortbow/string_bowstring_3.png new file mode 100644 index 00000000..8f76ed1e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/string_bowstring_3.png differ diff --git a/mods/tinker/textures/items/shortbow/string_bowstring_broken.png b/mods/tinker/textures/items/shortbow/string_bowstring_broken.png new file mode 100644 index 00000000..8ccc79df Binary files /dev/null and b/mods/tinker/textures/items/shortbow/string_bowstring_broken.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_bottom.png b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom.png new file mode 100644 index 00000000..8020046a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_1.png new file mode 100644 index 00000000..8020046a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_2.png new file mode 100644 index 00000000..d7a606da Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_3.png new file mode 100644 index 00000000..6e2ca98c Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_top.png b/mods/tinker/textures/items/shortbow/thaumium_bow_top.png new file mode 100644 index 00000000..b5d6106e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_top_1.png b/mods/tinker/textures/items/shortbow/thaumium_bow_top_1.png new file mode 100644 index 00000000..b5d6106e Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_top_2.png b/mods/tinker/textures/items/shortbow/thaumium_bow_top_2.png new file mode 100644 index 00000000..bb289156 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/thaumium_bow_top_3.png b/mods/tinker/textures/items/shortbow/thaumium_bow_top_3.png new file mode 100644 index 00000000..089d228c Binary files /dev/null and b/mods/tinker/textures/items/shortbow/thaumium_bow_top_3.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_bottom.png b/mods/tinker/textures/items/shortbow/wood_bow_bottom.png new file mode 100644 index 00000000..bfc9c430 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_bottom.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_bottom_1.png b/mods/tinker/textures/items/shortbow/wood_bow_bottom_1.png new file mode 100644 index 00000000..bfc9c430 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_bottom_1.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_bottom_2.png b/mods/tinker/textures/items/shortbow/wood_bow_bottom_2.png new file mode 100644 index 00000000..25f8a4c4 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_bottom_2.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_bottom_3.png b/mods/tinker/textures/items/shortbow/wood_bow_bottom_3.png new file mode 100644 index 00000000..5e34ea93 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_bottom_3.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_top.png b/mods/tinker/textures/items/shortbow/wood_bow_top.png new file mode 100644 index 00000000..c6832a55 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_top.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_top_1.png b/mods/tinker/textures/items/shortbow/wood_bow_top_1.png new file mode 100644 index 00000000..c6832a55 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_top_1.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_top_2.png b/mods/tinker/textures/items/shortbow/wood_bow_top_2.png new file mode 100644 index 00000000..c71b0d15 Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_top_2.png differ diff --git a/mods/tinker/textures/items/shortbow/wood_bow_top_3.png b/mods/tinker/textures/items/shortbow/wood_bow_top_3.png new file mode 100644 index 00000000..43e1ba9a Binary files /dev/null and b/mods/tinker/textures/items/shortbow/wood_bow_top_3.png differ diff --git a/spritesheets/bows.png b/spritesheets/bows.png index 4b6ee686..0cbaeeab 100644 Binary files a/spritesheets/bows.png and b/spritesheets/bows.png differ diff --git a/spritesheets/bows.txt b/spritesheets/bows.txt new file mode 100644 index 00000000..2e84686d --- /dev/null +++ b/spritesheets/bows.txt @@ -0,0 +1,180 @@ +0,0 - wood_bow_top_1 +1,0 - stone_bow_top_1 +2,0 - iron_bow_top_1 +3,0 - flint_bow_top_1 +4,0 - cactus_bow_top_1 +5,0 - bone_bow_top_1 +6,0 - obsidian_bow_top_1 +7,0 - netherrack_bow_top_1 +8,0 - slime_bow_top_1 +9,0 - paper_bow_top_1 +10,0 - cobalt_bow_top_1 +11,0 - ardite_bow_top_1 +12,0 - manyullyn_bow_top_1 +13,0 - copper_bow_top_1 +14,0 - bronze_bow_top_1 +15,0 - alumite_bow_top_1 +0,1 - wood_bow_bottom_1 +1,1 - stone_bow_bottom_1 +2,1 - iron_bow_bottom_1 +3,1 - flint_bow_bottom_1 +4,1 - cactus_bow_bottom_1 +5,1 - bone_bow_bottom_1 +6,1 - obsidian_bow_bottom_1 +7,1 - netherrack_bow_bottom_1 +8,1 - slime_bow_bottom_1 +9,1 - paper_bow_bottom_1 +10,1 - cobalt_bow_bottom_1 +11,1 - ardite_bow_bottom_1 +12,1 - manyullyn_bow_bottom_1 +13,1 - copper_bow_bottom_1 +14,1 - bronze_bow_bottom_1 +15,1 - alumite_bow_bottom_1 +0,2 - steel_bow_top_1 +1,2 - blueslime_bow_top_1 +0,3 - steel_bow_bottom_1 +1,3 - blueslime_bow_bottom_1 +0,4 - wood_bow_top_2 +1,4 - stone_bow_top_2 +2,4 - iron_bow_top_2 +3,4 - flint_bow_top_2 +4,4 - cactus_bow_top_2 +5,4 - bone_bow_top_2 +6,4 - obsidian_bow_top_2 +7,4 - netherrack_bow_top_2 +8,4 - slime_bow_top_2 +9,4 - paper_bow_top_2 +10,4 - cobalt_bow_top_2 +11,4 - ardite_bow_top_2 +12,4 - manyullyn_bow_top_2 +13,4 - copper_bow_top_2 +14,4 - bronze_bow_top_2 +15,4 - alumite_bow_top_2 +0,5 - wood_bow_bottom_2 +1,5 - stone_bow_bottom_2 +2,5 - iron_bow_bottom_2 +3,5 - flint_bow_bottom_2 +4,5 - cactus_bow_bottom_2 +5,5 - bone_bow_bottom_2 +6,5 - obsidian_bow_bottom_2 +7,5 - netherrack_bow_bottom_2 +8,5 - slime_bow_bottom_2 +9,5 - paper_bow_bottom_2 +10,5 - cobalt_bow_bottom_2 +11,5 - ardite_bow_bottom_2 +12,5 - manyullyn_bow_bottom_2 +13,5 - copper_bow_bottom_2 +14,5 - bronze_bow_bottom_2 +15,5 - alumite_bow_bottom_2 +0,6 - steel_bow_top_2 +1,6 - blueslime_bow_top_2 +0,7 - steel_bow_bottom_2 +1,7 - blueslime_bow_bottom_2 +0,8 - wood_bow_top_3 +1,8 - stone_bow_top_3 +2,8 - iron_bow_top_3 +3,8 - flint_bow_top_3 +4,8 - cactus_bow_top_3 +5,8 - bone_bow_top_3 +6,8 - obsidian_bow_top_3 +7,8 - netherrack_bow_top_3 +8,8 - slime_bow_top_3 +9,8 - paper_bow_top_3 +10,8 - cobalt_bow_top_3 +11,8 - ardite_bow_top_3 +12,8 - manyullyn_bow_top_3 +13,8 - copper_bow_top_3 +14,8 - bronze_bow_top_3 +15,8 - alumite_bow_top_3 +0,9 - wood_bow_bottom_3 +1,9 - stone_bow_bottom_3 +2,9 - iron_bow_bottom_3 +3,9 - flint_bow_bottom_3 +4,9 - cactus_bow_bottom_3 +5,9 - bone_bow_bottom_3 +6,9 - obsidian_bow_bottom_3 +7,9 - netherrack_bow_bottom_3 +8,9 - slime_bow_bottom_3 +9,9 - paper_bow_bottom_3 +10,9 - cobalt_bow_bottom_3 +11,9 - ardite_bow_bottom_3 +12,9 - manyullyn_bow_bottom_3 +13,9 - copper_bow_bottom_3 +14,9 - bronze_bow_bottom_3 +15,9 - alumite_bow_bottom_3 +0,10 - steel_bow_top_3 +1,10 - blueslime_bow_top_3 +0,11 - steel_bow_bottom_3 +1,11 - blueslime_bow_bottom_3 +8,11 - reinforced_bow_effect +9,11 - reinforced_bow_effect_1 +10,11 - reinforced_bow_effect_2 +11,11 - reinforced_bow_effect_3 +12,11 - string_bowstring +13,11 - string_bowstring_1 +14,11 - string_bowstring_2 +15,11 - string_bowstring_3 +0,12 - diamond_bow_effect +1,12 - emerald_bow_effect +2,12 - redstone_bow_effect +3,12 - piston_bow_effect +4,12 - moss_bow_effect +5,12 - ice_bow_effect +6,12 - lava_bow_effect +7,12 - blaze_bow_effect +8,12 - necrotic_bow_effect +9,12 - electric_bow_effect +10,12 - lapis_bow_effect +11,12 - silk_bow_effect +12,12 - quartz_bow_effect +13,12 - beheading_bow_effect +14,12 - smite_bow_effect +15,12 - spider_bow_effect +0,13 - diamond_bow_effect_1 +1,13 - emerald_bow_effect_1 +2,13 - redstone_bow_effect_1 +3,13 - piston_bow_effect_1 +4,13 - moss_bow_effect_1 +5,13 - ice_bow_effect_1 +6,13 - lava_bow_effect_1 +7,13 - blaze_bow_effect_1 +8,13 - necrotic_bow_effect_1 +9,13 - electric_bow_effect_1 +10,13 - lapis_bow_effect_1 +11,13 - silk_bow_effect_1 +12,13 - quartz_bow_effect_1 +13,13 - beheading_bow_effect_1 +14,13 - smite_bow_effect_1 +15,13 - spider_bow_effect_1 +0,14 - diamond_bow_effect_2 +1,14 - emerald_bow_effect_2 +2,14 - redstone_bow_effect_2 +3,14 - piston_bow_effect_2 +4,14 - moss_bow_effect_2 +5,14 - ice_bow_effect_2 +6,14 - lava_bow_effect_2 +7,14 - blaze_bow_effect_2 +8,14 - necrotic_bow_effect_2 +9,14 - electric_bow_effect_2 +10,14 - lapis_bow_effect_2 +11,14 - silk_bow_effect_2 +12,14 - quartz_bow_effect_2 +13,14 - beheading_bow_effect_2 +14,14 - smite_bow_effect_2 +15,14 - spider_bow_effect_2 +0,15 - diamond_bow_effect_3 +1,15 - emerald_bow_effect_3 +2,15 - redstone_bow_effect_3 +3,15 - piston_bow_effect_3 +4,15 - moss_bow_effect_3 +5,15 - ice_bow_effect_3 +6,15 - lava_bow_effect_3 +7,15 - blaze_bow_effect_3 +8,15 - necrotic_bow_effect_3 +9,15 - electric_bow_effect_3 +10,15 - lapis_bow_effect_3 +11,15 - silk_bow_effect_3 +12,15 - quartz_bow_effect_3 +13,15 - beheading_bow_effect_3 +14,15 - smite_bow_effect_3 +15,15 - spider_bow_effect_3 \ No newline at end of file diff --git a/spritesheets/cleaver.png b/spritesheets/cleaver.png index 2e4645e4..ec19d41d 100644 Binary files a/spritesheets/cleaver.png and b/spritesheets/cleaver.png differ