diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index e01a2574..bdedacce 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -38,7 +38,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; * @dependencies: IC2 API, MFR API */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.dev.52", dependencies = "required-after:Forge@[7.7.1.675,)") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.dev.57", 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 { diff --git a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java index 337edd69..1321b6b9 100644 --- a/mods/tinker/tconstruct/blocks/MultiBrickFancy.java +++ b/mods/tinker/tconstruct/blocks/MultiBrickFancy.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class MultiBrickFancy extends TConstructBlock { static String blockTextures[] = { "fancybrick_obsidian", "fancybrick_sandstone", "fancybrick_netherrack", "fancybrick_stone_refined", "fancybrick_iron", "fancybrick_gold", "fancybrick_lapis", "fancybrick_diamond", "fancybrick_redstone", - "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot" }; + "fancybrick_bone", "fancybrick_slime", "fancybrick_blueslime", "fancybrick_endstone", "fancybrick_obsidian_ingot", "road_stone", "road_refinedstone" }; public MultiBrickFancy(int id) { @@ -31,7 +31,6 @@ public class MultiBrickFancy extends TConstructBlock case 0: return Block.obsidian.getBlockHardness(world, x, y, z); case 1: return Block.sandStone.getBlockHardness(world, x, y, z); case 2: return Block.netherrack.getBlockHardness(world, x, y, z); - case 3: return Block.stone.getBlockHardness(world, x, y, z); case 4: return Block.blockIron.getBlockHardness(world, x, y, z); case 5: return Block.blockGold.getBlockHardness(world, x, y, z); case 6: return Block.blockLapis.getBlockHardness(world, x, y, z); @@ -42,6 +41,10 @@ public class MultiBrickFancy extends TConstructBlock case 11: return 1.5F; case 12: return Block.whiteStone.getBlockHardness(world, x, y, z); case 13: return Block.obsidian.getBlockHardness(world, x, y, z); + case 3: + case 14: + case 15: + return Block.stone.getBlockHardness(world, x, y, z); default: return blockHardness; } } @@ -54,7 +57,6 @@ public class MultiBrickFancy extends TConstructBlock case 0: return Block.obsidian.getExplosionResistance(entity); case 1: return Block.sandStone.getExplosionResistance(entity); case 2: return Block.netherrack.getExplosionResistance(entity); - case 3: return Block.stone.getExplosionResistance(entity); case 4: return Block.blockIron.getExplosionResistance(entity); case 5: return Block.blockGold.getExplosionResistance(entity); case 6: return Block.blockLapis.getExplosionResistance(entity); @@ -65,6 +67,10 @@ public class MultiBrickFancy extends TConstructBlock case 11: return 1.5F; case 12: return Block.whiteStone.getExplosionResistance(entity); case 13: return Block.obsidian.getExplosionResistance(entity); + case 3: + case 14: + case 15: + return Block.stone.getExplosionResistance(entity); default: return getExplosionResistance(entity); } } diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 0733740f..011baaa8 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -557,15 +557,19 @@ 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]); } - - addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", - "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Triple\nDamage: Low, AoE"); + + 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- (3x3x3)\n- Smite\n\nDurability: High"); addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe", - "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abiliyies:\n- Fell Trees\nArea of Effect\n- (3x3x3)\n\nDurability: Triple"); + "The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\n- Fell Trees\nArea of Effect\n- (3x3x3)\n\nDurability: Average"); addTierTwoButton(4, 12, 0, new int[] { 10, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Excavator", - "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Triple"); - addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Breaker Blade", - "The Breaker Blade is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: Very High\nDurability: Triple"); + "The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average"); + addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe", + "The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE"); + addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver", + "The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: Very High\nDurability: Average"); + addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe", + "The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average"); } void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body) @@ -583,11 +587,15 @@ 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[] effectTypes = { "diamond", "emerald", "redstone", "glowstone", "moss", "ice", "lava", "blaze", "necrotic", "electric", "lapis", "quartz", "silk" }; - int[] validHarvestEffects = { 0, 1, 2, 4, 6, 7, 8, 9, 10, 11, 12 }; + /*int[] validHarvestEffects = { 0, 1, 2, 4, 6, 7, 8, 9, 10, 11, 12 }; int[] validWeaponEffects = { 0, 1, 4, 5, 6, 7, 8, 9, 10, 11, 12 }; int[] validUtilityEffects = { 0, 1, 4, 9 }; - int[] validDaggerEffects = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12 }; + int[] validDaggerEffects = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12 };*/ + int[] universalEffects = { 0, 1, 4, 9 }; + int[] weaponEffects = { 5, 7, 8, 12 }; + int[] harvestEffects = { 2 }; + int[] nonUtility = { 6, 10, 11 }; for (int partIter = 0; partIter < partTypes.length; partIter++) { @@ -596,46 +604,36 @@ public class TProxyClient extends TProxyCommon for (ToolCore tool : TConstructRegistry.getToolMapping()) { - if (tool instanceof Dagger) - { - for (int i = 0; i < validDaggerEffects.length; i++) - { - TConstructClientRegistry.addEffectRenderMapping(validDaggerEffects[i], "tinker", effectTypes[validDaggerEffects[i]], true); - } - return; - } List list = Arrays.asList(tool.toolCategories()); + for (int i = 0; i < universalEffects.length; i++) + { + TConstructClientRegistry.addEffectRenderMapping(universalEffects[i], "tinker", effectTypes[universalEffects[i]], true); + } + if (list.contains("harvest")) - { - for (int i = 0; i < validHarvestEffects.length; i++) + { + for (int i = 0; i < harvestEffects.length; i++) { - TConstructClientRegistry.addEffectRenderMapping(validHarvestEffects[i], "tinker", effectTypes[validHarvestEffects[i]], true); + TConstructClientRegistry.addEffectRenderMapping(harvestEffects[i], "tinker", effectTypes[harvestEffects[i]], true); } } - else if (list.contains("melee")) + + if (list.contains("weapon")) { - for (int i = 0; i < validWeaponEffects.length; i++) + for (int i = 0; i < weaponEffects.length; i++) { - TConstructClientRegistry.addEffectRenderMapping(validWeaponEffects[i], "tinker", effectTypes[validWeaponEffects[i]], true); + TConstructClientRegistry.addEffectRenderMapping(weaponEffects[i], "tinker", effectTypes[weaponEffects[i]], true); } } - else if (list.contains("utility")) + + if (list.contains("weapon") || list.contains("harvest")) { - for (int i = 0; i < validUtilityEffects.length; i++) + for (int i = 0; i < nonUtility.length; i++) { - TConstructClientRegistry.addEffectRenderMapping(validUtilityEffects[i], "tinker", effectTypes[validUtilityEffects[i]], true); + TConstructClientRegistry.addEffectRenderMapping(nonUtility[i], "tinker", effectTypes[nonUtility[i]], true); } } - //return list.contains("throwing"); } - /*for (int effectIter = 0; effectIter < 3; effectIter++) - { - TConstructClientRegistry.addEffectRenderMapping(effectIter, "tinker", effectTypes[effectIter], true); - } - for (int effectIter = 4; effectIter < effectTypes.length; effectIter++) - { - TConstructClientRegistry.addEffectRenderMapping(effectIter, "tinker", effectTypes[effectIter], true); - }*/ } /* Keybindings */ diff --git a/mods/tinker/tconstruct/client/gui/ToolForgeGui.java b/mods/tinker/tconstruct/client/gui/ToolForgeGui.java index 8c1cc04e..7aec1bc1 100644 --- a/mods/tinker/tconstruct/client/gui/ToolForgeGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolForgeGui.java @@ -150,6 +150,10 @@ public class ToolForgeGui extends NewContainerGui slotX = new int[] { 38, 47, 56, 47 }; // Four parts, double head slotY = new int[] { 19, 55, 19, 37 }; break; + case 6: + slotX = new int[] { 38, 38, 20, 56 }; // Double head + slotY = new int[] { 28, 46, 28, 28 }; + break; } toolSlots.resetSlots(slotX, slotY); } diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java index 65742928..3c78359f 100644 --- a/mods/tinker/tconstruct/common/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -3,108 +3,21 @@ package mods.tinker.tconstruct.common; import java.util.Collection; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.blocks.EquipBlock; -import mods.tinker.tconstruct.blocks.GravelOre; -import mods.tinker.tconstruct.blocks.LavaTankBlock; -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.OreberryBush; -import mods.tinker.tconstruct.blocks.SearedBlock; -import mods.tinker.tconstruct.blocks.SmelteryBlock; -import mods.tinker.tconstruct.blocks.SpeedBlock; -import mods.tinker.tconstruct.blocks.StoneTorch; -import mods.tinker.tconstruct.blocks.TConstructBlock; -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.FaucetLogic; -import mods.tinker.tconstruct.blocks.logic.FrypanLogic; -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.StencilTableLogic; -import mods.tinker.tconstruct.blocks.logic.SmelteryDrainLogic; -import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; -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.FancyEntityItem; -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.HeartCanister; -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.ToolShard; -import mods.tinker.tconstruct.items.armor.Glove; -import mods.tinker.tconstruct.items.armor.TArmorBase; -import mods.tinker.tconstruct.items.blocks.CraftedSoilItemBlock; -import mods.tinker.tconstruct.items.blocks.GravelOreItem; -import mods.tinker.tconstruct.items.blocks.LavaTankItemBlock; -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.MultiBrickItem; -import mods.tinker.tconstruct.items.blocks.OreberryBushItem; -import mods.tinker.tconstruct.items.blocks.OreberryBushSecondItem; -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.ToolForgeItemBlock; -import mods.tinker.tconstruct.items.blocks.ToolStationItemBlock; -import mods.tinker.tconstruct.items.tools.BattleSign; -import mods.tinker.tconstruct.items.tools.Broadsword; -import mods.tinker.tconstruct.items.tools.Chisel; -import mods.tinker.tconstruct.items.tools.BreakerBlade; -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.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.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.TConstructRegistry; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; -import mods.tinker.tconstruct.library.crafting.Detailing; -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.crafting.*; import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.util.IPattern; -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.ModRedstone; -import mods.tinker.tconstruct.modifiers.ModRepair; -import mods.tinker.tconstruct.modifiers.TActiveOmniMod; -import mods.tinker.tconstruct.util.PHConstruct; -import mods.tinker.tconstruct.util.RecipeRemover; +import mods.tinker.tconstruct.modifiers.*; +import mods.tinker.tconstruct.util.*; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -168,8 +81,10 @@ public class TContent implements IFuelHandler public static ToolCore scythe; public static ToolCore lumberaxe; - public static ToolCore breakerBlade; + public static ToolCore cleaver; public static ToolCore excavator; + public static ToolCore hammer; + public static ToolCore battleaxe; public static Item potionLauncher; @@ -177,7 +92,7 @@ public class TContent implements IFuelHandler public static Item binding; public static Item toughBinding; public static Item toughRod; - public static Item largePlate; + public static Item heavyPlate; public static Item pickaxeHead; public static Item shovelHead; @@ -186,8 +101,9 @@ public class TContent implements IFuelHandler public static Item signHead; public static Item chiselHead; public static Item scytheBlade; - public static Item lumberHead; + public static Item broadAxeHead; public static Item excavatorHead; + public static Item hammerHead; public static Item swordBlade; public static Item largeSwordBlade; @@ -487,11 +403,14 @@ public class TContent implements IFuelHandler frypan = new FryingPan(PHConstruct.frypan); battlesign = new BattleSign(PHConstruct.battlesign); mattock = new Mattock(PHConstruct.mattock); - scythe = new Scythe(PHConstruct.scythe); - lumberaxe = new LumberAxe(PHConstruct.lumberaxe); chisel = new Chisel(PHConstruct.chisel); - breakerBlade = new BreakerBlade(PHConstruct.cleaver); + + lumberaxe = new LumberAxe(PHConstruct.lumberaxe); + cleaver = new Cleaver(PHConstruct.cleaver); + scythe = new Scythe(PHConstruct.scythe); excavator = new Excavator(PHConstruct.excavator); + hammer = new Hammer(PHConstruct.hammer); + battleaxe = new Battleaxe(PHConstruct.battleaxe); potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); @@ -501,7 +420,7 @@ public class TContent implements IFuelHandler binding = new ToolPart(PHConstruct.binding, "Binding", "_binding").setUnlocalizedName("tconstruct.Binding"); toughBinding = new ToolPart(PHConstruct.toughBinding, "ThickBinding", "_toughbind").setUnlocalizedName("tconstruct.ThickBinding"); toughRod = new ToolPart(PHConstruct.toughRod, "ThickRod", "_toughrod").setUnlocalizedName("tconstruct.ThickRod"); - largePlate = new ToolPart(PHConstruct.largePlate, "LargePlate", "_largeplate").setUnlocalizedName("tconstruct.LargePlate"); + heavyPlate = new ToolPart(PHConstruct.largePlate, "LargePlate", "_largeplate").setUnlocalizedName("tconstruct.LargePlate"); swordBlade = new ToolPart(PHConstruct.swordBlade, "SwordBlade", "_sword_blade").setUnlocalizedName("tconstruct.SwordBlade"); wideGuard = new ToolPart(PHConstruct.largeGuard, "LargeGuard", "_large_guard").setUnlocalizedName("tconstruct.LargeGuard"); @@ -514,9 +433,10 @@ public class TContent implements IFuelHandler chiselHead = new ToolPart(PHConstruct.chiselHead, "ChiselHead", "_chisel_head").setUnlocalizedName("tconstruct.ChiselHead"); scytheBlade = new ToolPart(PHConstruct.scytheBlade, "ScytheBlade", "_scythe_head").setUnlocalizedName("tconstruct.ScytheBlade"); - lumberHead = new ToolPart(PHConstruct.lumberHead, "LumberHead", "_lumberaxe_head").setUnlocalizedName("tconstruct.LumberHead"); + broadAxeHead = new ToolPart(PHConstruct.lumberHead, "LumberHead", "_lumberaxe_head").setUnlocalizedName("tconstruct.LumberHead"); excavatorHead = new ToolPart(PHConstruct.excavatorHead, "ExcavatorHead", "_excavator_head").setUnlocalizedName("tconstruct.ExcavatorHead"); largeSwordBlade = new ToolPart(PHConstruct.largeSwordBlade, "LargeSwordBlade", "_large_sword_blade").setUnlocalizedName("tconstruct.LargeSwordBlade"); + hammerHead = new ToolPart(PHConstruct.hammerHead, "HammerHead", "_hammer_head").setUnlocalizedName("tconstruct.HammerHead"); diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); @@ -635,7 +555,7 @@ public class TContent implements IFuelHandler { /* Tools */ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, axeHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, - toughRod, toughBinding, largePlate, lumberHead, scytheBlade, excavatorHead, largeSwordBlade}; + toughRod, toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead}; ToolBuilder tb = ToolBuilder.instance; tb.addToolRecipe(pickaxe, pickaxeHead, binding); @@ -650,12 +570,11 @@ public class TContent implements IFuelHandler tb.addToolRecipe(dagger, knifeBlade, crossbar); tb.addToolRecipe(chisel, chiselHead); tb.addCustomToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod); - tb.addCustomToolRecipe(lumberaxe, lumberHead, toughRod, largePlate, toughBinding); - tb.addCustomToolRecipe(breakerBlade, largeSwordBlade, toughRod, largePlate, toughRod); + tb.addCustomToolRecipe(lumberaxe, broadAxeHead, toughRod, heavyPlate, toughBinding); + tb.addCustomToolRecipe(cleaver, largeSwordBlade, toughRod, heavyPlate, toughRod); tb.addCustomToolRecipe(excavator, excavatorHead, toughRod, toughBinding, toughRod); - - //tb.addToolRecipe(longbow, toolRod, toolRod); - //tb.addToolRecipe(lumberaxe, lumberHead); + tb.addCustomToolRecipe(hammer, hammerHead, toughRod, heavyPlate, heavyPlate); + tb.addCustomToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding); ItemStack diamond = new ItemStack(Item.diamond); tb.registerToolMod(new ModRepair()); diff --git a/mods/tinker/tconstruct/common/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java index 3db2c890..cd46d6a4 100644 --- a/mods/tinker/tconstruct/common/TProxyCommon.java +++ b/mods/tinker/tconstruct/common/TProxyCommon.java @@ -145,8 +145,10 @@ public class TProxyCommon implements IGuiHandler LanguageRegistry.addName(TContent.chisel, "Chisel"); LanguageRegistry.addName(TContent.scythe, "Scythe"); LanguageRegistry.addName(TContent.lumberaxe, "Lumber Axe"); - LanguageRegistry.addName(TContent.breakerBlade, "Breaker Blade"); + LanguageRegistry.addName(TContent.cleaver, "Cleaver"); LanguageRegistry.addName(TContent.excavator, "Excavator"); + LanguageRegistry.addName(TContent.hammer, "Hammer"); + LanguageRegistry.addName(TContent.battleaxe, "Battleaxe"); } @@ -175,14 +177,15 @@ public class TProxyCommon implements IGuiHandler "Copper", "Bronze", "Alumite", "Steel", "Blue Slime" }; public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead", - "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead" }; + "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead" }; public static final String[] materialNames = new String[] { " Rod", " Pickaxe Head", " Shovel Head", " Axe Head", " Sword Blade", " Wide Guard", " Hand Guard", " Crossbar", " Binding", " Pan", - " Board", " Broad Axe Head", " Knife Blade", " Chisel Head", " Scythe Blade", " Broad Axe Head", " Tough Tool Rod", " Tough Binding", " Large Sword Blade", " Large Plate", " Excavator Head" }; + " Board", " Broad Axe Head", " Knife Blade", " Chisel Head", " Scythe Blade", " Broad Axe Head", " Tough Tool Rod", " Tough Binding", " Large Sword Blade", " Large Plate", " Excavator Head", + " Hammer Head"}; 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"}; + "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead"}; 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" }; + "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" }; } diff --git a/mods/tinker/tconstruct/entity/BlueSlime.java b/mods/tinker/tconstruct/entity/BlueSlime.java index 40a69cd4..ff5a91be 100644 --- a/mods/tinker/tconstruct/entity/BlueSlime.java +++ b/mods/tinker/tconstruct/entity/BlueSlime.java @@ -435,7 +435,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData if (size == 8) { - ToolCore tool = TConstructRegistry.tools.get(rand.nextInt(TConstructRegistry.tools.size())); + ToolCore tool = getValidTool(); Item accessory = tool.getAccessoryItem(); ItemStack accessoryStack = accessory != null ? new ItemStack(tool.getAccessoryItem(), 1, 17) : null; @@ -456,6 +456,14 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData } } } + + ToolCore getValidTool() + { + ToolCore tool = TConstructRegistry.tools.get(rand.nextInt(TConstructRegistry.tools.size())); + if (tool.getAccessoryItem() != null) + tool = getValidTool(); + return tool; + } /** * Called by a player entity when they collide with an entity diff --git a/mods/tinker/tconstruct/event/ToolCraftEvent.java b/mods/tinker/tconstruct/event/ToolCraftEvent.java new file mode 100644 index 00000000..0773a13e --- /dev/null +++ b/mods/tinker/tconstruct/event/ToolCraftEvent.java @@ -0,0 +1,20 @@ +package mods.tinker.tconstruct.event; + +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMaterial; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.event.Event; + +public class ToolCraftEvent extends Event +{ + public final ToolCore tool; + public final NBTTagCompound toolTag; + public final ToolMaterial[] materials; + + public ToolCraftEvent(ToolCore tool, NBTTagCompound toolTag, ToolMaterial[] materials) + { + this.tool = tool; + this.toolTag = toolTag; + this.materials = materials; + } +} diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index 9ed2b0d9..3c261154 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -34,7 +34,7 @@ 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" }; + "broadaxe", "scythe", "excavator", "largeblade", "hammerhead" }; /*@SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) @@ -104,6 +104,7 @@ public class Pattern extends CraftingItem case 18: return 16; case 19: return 16; case 20: return 16; + case 21: return 16; default: return 0; } } diff --git a/mods/tinker/tconstruct/items/tools/Battleaxe.java b/mods/tinker/tconstruct/items/tools/Battleaxe.java new file mode 100644 index 00000000..63a1af86 --- /dev/null +++ b/mods/tinker/tconstruct/items/tools/Battleaxe.java @@ -0,0 +1,222 @@ +package mods.tinker.tconstruct.items.tools; + +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.ActiveToolMod; +import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.HarvestTool; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class Battleaxe extends HarvestTool +{ + public Battleaxe(int itemID) + { + super(itemID, 4); + this.setUnlocalizedName("InfiTool.Battleaxe"); + } + + @Override + protected Material[] getEffectiveMaterials () + { + return materials; + } + + @Override + protected String getHarvestType () + { + return "axe"; + } + + @Override + public boolean onBlockDestroyed (ItemStack itemstack, World world, int bID, int x, int y, int z, EntityLiving player) + { + Block block = Block.blocksList[bID]; + if (block != null && block.blockMaterial == Material.leaves) + return false; + + return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, player, random); + } + + static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.pumpkin }; + + @Override + public Item getHeadItem () + { + return TContent.broadAxeHead; + } + + @Override + public Item getHandleItem () + { + return TContent.toughRod; + } + + @Override + public Item getAccessoryItem () + { + return TContent.broadAxeHead; + } + + @Override + public Item getExtraItem () + { + return TContent.toughBinding; + } + + @Override + public float getRepairCost () + { + return 4.0f; + } + + public float getDurabilityModifier () + { + return 2.5f; + } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 10; + } + + @Override + public int getPartAmount () + { + return 4; + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_battleaxe_fronthead"; + case 1: + return "_battleaxe_fronthead_broken"; + case 2: + return "_battleaxe_handle"; + case 3: + return "_battleaxe_backhead"; + case 4: + return "_battleaxe_binding"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_battleaxe_effect"; + } + + @Override + public String getDefaultFolder () + { + return "battleaxe"; + } + + @Override + public String[] toolCategories() + { + return new String[] { "weapon", "harvest", "slicing" }; + } + + /* Battleaxe Specific */ + + /* Lumber axe specific */ + @Override + public boolean hitEntity (ItemStack stack, EntityLiving mob, EntityLiving player) + { + AbilityHelper.knockbackEntity(mob, 1.5f); + return true; + } + + @Override + public float getStrVsBlock (ItemStack stack, Block block, int meta) + { + if (!stack.hasTagCompound()) + return 1.0f; + + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (tags.getBoolean("Broken")) + return 0.1f; + + Material[] materials = getEffectiveMaterials(); + for (int i = 0; i < materials.length; i++) + { + if (materials[i] == block.blockMaterial) + { + float speed = tags.getInteger("MiningSpeed"); + speed /= 200f; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float shoddy = tags.getFloat("Shoddy"); + speed += shoddy * durability / 100f; + + if (hlvl <= tags.getInteger("HarvestLevel")) + return speed; + return 0.1f; + } + } + return super.getStrVsBlock(stack, block, meta); + } + + @Override + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) + { + World world = player.worldObj; + int woodID = world.getBlockId(x, y, z); + Block wood = Block.blocksList[woodID]; + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int meta = world.getBlockMetadata(x, y, z); + for (int yPos = y + 1; yPos < y + 9; yPos++) + { + int blockID = world.getBlockId(x, yPos, z); + Block block = Block.blocksList[blockID]; + if (!(tags.getBoolean("Broken")) && block != null && block.blockMaterial == Material.wood ) + { + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + if (mod.beforeBlockBreak(this, stack, x, yPos, z, player)) + cancelHarvest = true; + } + + if (!cancelHarvest) + { + if (block != null && block.blockMaterial == Material.wood) + { + meta = world.getBlockMetadata(x, yPos, z); + world.setBlockToAir(x, yPos, z); + if (!player.capabilities.isCreativeMode) + { + Block.blocksList[blockID].harvestBlock(world, player, x, yPos, z, meta); + onBlockDestroyed(stack, world, blockID, x, yPos, z, player); + } + } + } + } + + } + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); + return super.onBlockStartBreak(stack, x, y, z, player); + } +} diff --git a/mods/tinker/tconstruct/items/tools/BreakerBlade.java b/mods/tinker/tconstruct/items/tools/Cleaver.java similarity index 93% rename from mods/tinker/tconstruct/items/tools/BreakerBlade.java rename to mods/tinker/tconstruct/items/tools/Cleaver.java index f529efad..8073f366 100644 --- a/mods/tinker/tconstruct/items/tools/BreakerBlade.java +++ b/mods/tinker/tconstruct/items/tools/Cleaver.java @@ -14,9 +14,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BreakerBlade extends Weapon +public class Cleaver extends Weapon { - public BreakerBlade(int itemID) + public Cleaver(int itemID) { super(itemID, 4); this.setUnlocalizedName("InfiTool.Cleaver"); @@ -37,7 +37,7 @@ public class BreakerBlade extends Weapon @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TContent.heavyPlate; } @Override @@ -59,7 +59,7 @@ public class BreakerBlade extends Weapon } @Override - public float getRepairModifier () + public float getRepairCost () { return 4.0f; } @@ -88,12 +88,6 @@ public class BreakerBlade extends Weapon { return 4; } - - public String getToolName () - { - return "Breaker Blade"; - } - @Override public String getIconSuffix (int partType) diff --git a/mods/tinker/tconstruct/items/tools/Dagger.java b/mods/tinker/tconstruct/items/tools/Dagger.java index 4db88027..65458781 100644 --- a/mods/tinker/tconstruct/items/tools/Dagger.java +++ b/mods/tinker/tconstruct/items/tools/Dagger.java @@ -21,8 +21,16 @@ public class Dagger extends Weapon public ItemStack onItemRightClick (ItemStack itemstack, World world, EntityPlayer player) { - player.setItemInUse(itemstack, this.getMaxItemUseDuration(itemstack)); + ItemStack stack = itemstack.copy(); + if (!world.isRemote) + { + DaggerEntity dagger = new DaggerEntity(stack, world, player); + world.spawnEntityInWorld(dagger); + } + itemstack.stackSize--; return itemstack; + /*player.setItemInUse(itemstack, this.getMaxItemUseDuration(itemstack)); + return itemstack;*/ } public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer player) diff --git a/mods/tinker/tconstruct/items/tools/Excavator.java b/mods/tinker/tconstruct/items/tools/Excavator.java index 257a8ba7..382e2426 100644 --- a/mods/tinker/tconstruct/items/tools/Excavator.java +++ b/mods/tinker/tconstruct/items/tools/Excavator.java @@ -1,52 +1,62 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.ActiveToolMod; +import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.HarvestTool; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class Excavator extends HarvestTool { - public Excavator(int itemID) - { - super(itemID, 2); - this.setUnlocalizedName("InfiTool.Excavator"); - } - - @Override - protected Material[] getEffectiveMaterials() - { - return materials; - } + public Excavator(int itemID) + { + super(itemID, 2); + this.setUnlocalizedName("InfiTool.Excavator"); + } - @Override - protected String getHarvestType() - { - return "shovel"; - } - - static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + @Override + protected Material[] getEffectiveMaterials () + { + return materials; + } + + @Override + protected String getHarvestType () + { + return "shovel"; + } + + static Material[] materials = { Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; + + @Override + public Item getHeadItem () + { + return TContent.excavatorHead; + } - @Override - public Item getHeadItem () - { - return TContent.excavatorHead; - } - @Override public Item getHandleItem () { return TContent.toughRod; } - @Override - public Item getAccessoryItem () - { - return TContent.toughBinding; - } - + @Override + public Item getAccessoryItem () + { + return TContent.toughBinding; + } + @Override public Item getExtraItem () { @@ -54,7 +64,7 @@ public class Excavator extends HarvestTool } @Override - public float getRepairModifier () + public float getRepairCost () { return 4.0f; } @@ -63,7 +73,7 @@ public class Excavator extends HarvestTool { return 2.75f; } - + @Override public int durabilityTypeAccessory () { @@ -75,49 +85,160 @@ public class Excavator extends HarvestTool { return 1; } - - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 10; - } - - @Override - public int getPartAmount() - { - return 4; - } - - @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_excavator_head"; - case 1: - return "_excavator_head_broken"; - case 2: - return "_excavator_handle"; + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 10; + } + + @Override + public int getPartAmount () + { + return 4; + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_excavator_head"; + case 1: + return "_excavator_head_broken"; + case 2: + return "_excavator_handle"; case 3: return "_excavator_binding"; case 4: return "_excavator_grip"; - default: - return ""; - } - } + default: + return ""; + } + } - @Override - public String getEffectSuffix () - { - return "_excavator_effect"; - } + @Override + public String getEffectSuffix () + { + return "_excavator_effect"; + } - @Override - public String getDefaultFolder () - { - return "excavator"; - } + @Override + public String getDefaultFolder () + { + return "excavator"; + } + + /* Excavator Specific */ + + @Override + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) + { + World world = player.worldObj; + int blockID = 0; + int meta = 0; + if (!stack.hasTagCompound()) + return false; + + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 6); + if (mop == null) + return super.onBlockStartBreak(stack, x, y, z, player); + + int xRange = 1; + int yRange = 1; + int zRange = 1; + switch (mop.sideHit) + { + case 0: + case 1: + yRange = 0; + break; + case 2: + case 3: + zRange = 0; + break; + case 4: + case 5: + xRange = 0; + break; + } + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + for (int xPos = x - xRange; xPos <= x + xRange; xPos++) + { + for (int yPos = y - yRange; yPos <= y + yRange; yPos++) + { + for (int zPos = z - zRange; zPos <= z + zRange; zPos++) + { + if (!(tags.getBoolean("Broken"))) + { + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) + cancelHarvest = true; + } + + if (!cancelHarvest) + { + int localblockID = world.getBlockId(xPos, yPos, zPos); + Block block = Block.blocksList[localblockID]; + if (block != null) + { + for (int iter = 0; iter < materials.length; iter++) + { + if (materials[iter] == block.blockMaterial) + { + meta = world.getBlockMetadata(xPos, yPos, zPos); + world.setBlockToAir(xPos, yPos, zPos); + if (!player.capabilities.isCreativeMode) + { + block.harvestBlock(world, player, xPos, yPos, zPos, meta); + onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); + } + blockID = localblockID; + } + } + } + } + } + } + } + } + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, blockID + (meta << 12)); + return super.onBlockStartBreak(stack, x, y, z, player); + } + + @Override + public float getStrVsBlock (ItemStack stack, Block block, int meta) + { + if (!stack.hasTagCompound()) + return 1.0f; + + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (tags.getBoolean("Broken")) + return 0.1f; + + Material[] materials = getEffectiveMaterials(); + for (int i = 0; i < materials.length; i++) + { + if (materials[i] == block.blockMaterial) + { + float speed = tags.getInteger("MiningSpeed"); + speed /= 200f; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float shoddy = tags.getFloat("Shoddy"); + speed += shoddy * durability / 100f; + + if (hlvl <= tags.getInteger("HarvestLevel")) + return speed; + return 0.1f; + } + } + return super.getStrVsBlock(stack, block, meta); + } } diff --git a/mods/tinker/tconstruct/items/tools/Hammer.java b/mods/tinker/tconstruct/items/tools/Hammer.java index 35c6bda0..ab141b91 100644 --- a/mods/tinker/tconstruct/items/tools/Hammer.java +++ b/mods/tinker/tconstruct/items/tools/Hammer.java @@ -2,122 +2,331 @@ package mods.tinker.tconstruct.items.tools; import java.util.ArrayList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.ActiveToolMod; +import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.library.tools.HarvestTool; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; public class Hammer extends HarvestTool { - public Hammer(int itemID) - { - super(itemID, 4); - this.setUnlocalizedName("InfiTool.Hammer"); - setupCoords(); - } - - @Override - public int getHeadType () - { - return 1; - } - - @Override - protected String getHarvestType() - { - return "pickaxe"; - } + public Hammer(int itemID) + { + super(itemID, 2); + this.setUnlocalizedName("InfiTool.Hammer"); + setupCoords(); + } - @Override - protected Material[] getEffectiveMaterials() - { - return materials; - } + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 10; + } - static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; - - /* Hammer specfic methods */ - - ArrayList coords = new ArrayList(); - - void setupCoords() - { - coords.add(new int[] {1, 0, 0 }); - coords.add(new int[] {-1, 0, 0}); - coords.add(new int[] {0, 1, 0 }); - coords.add(new int[] {0, -1, 0}); - coords.add(new int[] {0, 0, 1 }); - coords.add(new int[] {0, 0, -1}); - } - - //@Override - /*public boolean onBlockDestroyed (ItemStack itemstack, World world, int bID, int x, int y, int z, EntityLiving living) - { - if (!(itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) && living instanceof EntityPlayer) - { - EntityPlayer player = (EntityPlayer)living; - for (int[] coord : coords) - { - int xPos = x+coord[0], yPos = y+coord[1], zPos = z+coord[2]; - Block block = Block.blocksList[world.getBlockId(xPos, yPos, zPos)]; - { - if (block != null) - { - if (block.blockID == Block.stone.blockID) - world.setBlock(xPos, yPos, zPos, Block.cobblestone.blockID); - else if (block.blockMaterial == Material.rock) - { - int meta = world.getBlockMetadata(xPos, yPos, zPos); - world.setBlockToAir(x, y, z); - Block.blocksList[bID].harvestBlock(world, (EntityPlayer)player, xPos, yPos, zPos, meta); - if (!player.capabilities.isCreativeMode) - onBlockDestroyed(itemstack, world, bID, xPos, yPos, zPos, player); - } - } - } - } - } - return AbilityHelper.onBlockChanged(itemstack, world, bID, x, y, z, living, random); - }*/ + @Override + public int getPartAmount () + { + return 4; + } - @Override - public Item getHeadItem () - { - return null; - } + public int durabilityTypeHandle () + { + return 2; + } - @Override - public Item getAccessoryItem () - { - return null; - } - - @Override - public String getIconSuffix (int partType) - { - switch (partType) - { - case 0: - return "_hammer_head"; - case 1: - return "_hammer_head_broken"; - case 2: - return "_hammer_handle"; - case 3: - return "_hammer_accessory"; - default: - return ""; - } - } + public int durabilityTypeAccessory () + { + return 2; + } - @Override - public String getEffectSuffix () - { - return "_hammer_effect"; - } + public int durabilityTypeExtra () + { + return 1; + } - @Override - public String getDefaultFolder () - { - return "hammer"; - } + @Override + protected String getHarvestType () + { + return "pickaxe"; + } + + @Override + protected Material[] getEffectiveMaterials () + { + return materials; + } + + static Material[] materials = new Material[] { Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; + + @Override + public Item getHeadItem () + { + return TContent.hammerHead; + } + + @Override + public Item getHandleItem () + { + return TContent.toughRod; + } + + @Override + public Item getAccessoryItem () + { + return TContent.heavyPlate; + } + + @Override + public Item getExtraItem () + { + return TContent.heavyPlate; + } + + public float getDurabilityModifier () + { + return 5.5f; + } + + @Override + public String getIconSuffix (int partType) + { + switch (partType) + { + case 0: + return "_hammer_head"; + case 1: + return "_hammer_handle_broken"; + case 2: + return "_hammer_handle"; + case 3: + return "_hammer_front"; + case 4: + return "_hammer_back"; + default: + return ""; + } + } + + @Override + public String getEffectSuffix () + { + return "_hammer_effect"; + } + + @Override + public String getDefaultFolder () + { + return "hammer"; + } + + @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; + } + + ArrayList coords = new ArrayList(); + + void setupCoords () + { + coords.add(new int[] { 0, 0, 0 }); + coords.add(new int[] { 1, 0, 0 }); + coords.add(new int[] { -1, 0, 0 }); + coords.add(new int[] { 0, 1, 0 }); + coords.add(new int[] { 0, -1, 0 }); + coords.add(new int[] { 0, 0, 1 }); + coords.add(new int[] { 0, 0, -1 }); + + coords.add(new int[] { -1, 0, 0 }); + coords.add(new int[] { -1, 0, 1 }); + coords.add(new int[] { -1, 0, -1 }); + coords.add(new int[] { -1, 1, 0 }); + coords.add(new int[] { -1, -1, 0 }); + + coords.add(new int[] { 1, 0, 0 }); + coords.add(new int[] { 1, 0, 1 }); + coords.add(new int[] { 1, 0, -1 }); + coords.add(new int[] { 1, 1, 0 }); + coords.add(new int[] { 1, -1, 0 }); + + coords.add(new int[] { 0, 1, 1 }); + coords.add(new int[] { 0, 1, 0 }); + coords.add(new int[] { 0, 1, -1 }); + + coords.add(new int[] { 0, -1, 1 }); + coords.add(new int[] { 0, -1, 0 }); + coords.add(new int[] { 0, -1, -1 }); + } + + @Override + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) + { + World world = player.worldObj; + int blockID = 0; + int meta = 0; + if (!stack.hasTagCompound()) + return false; + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + + if (!(tags.getBoolean("Broken"))) + { + for (int[] coord : coords) + { + int xPos = x + coord[0], yPos = y + coord[1], zPos = z + coord[2]; + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + if (mod.beforeBlockBreak(this, stack, xPos, yPos, zPos, player)) + cancelHarvest = true; + } + + if (!cancelHarvest) + { + int localblockID = world.getBlockId(xPos, yPos, zPos); + Block block = Block.blocksList[localblockID]; + if (block != null) + { + for (int iter = 0; iter < materials.length; iter++) + { + if (materials[iter] == block.blockMaterial) + { + meta = world.getBlockMetadata(xPos, yPos, zPos); + world.setBlockToAir(xPos, yPos, zPos); + if (!player.capabilities.isCreativeMode) + { + block.harvestBlock(world, player, xPos, yPos, zPos, meta); + onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); + } + blockID = localblockID; + } + } + } + } + } + } + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, blockID + (meta << 12)); + return super.onBlockStartBreak(stack, x, y, z, player); + } + + @Override + public float getStrVsBlock (ItemStack stack, Block block, int meta) + { + if (!stack.hasTagCompound()) + return 1.0f; + + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if (tags.getBoolean("Broken")) + return 0.1f; + + Material[] materials = getEffectiveMaterials(); + for (int i = 0; i < materials.length; i++) + { + if (materials[i] == block.blockMaterial) + { + float speed = tags.getInteger("MiningSpeed"); + speed /= 200f; + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float shoddy = tags.getFloat("Shoddy"); + speed += shoddy * durability / 100f; + + if (hlvl <= tags.getInteger("HarvestLevel")) + return speed; + return 0.1f; + } + } + return super.getStrVsBlock(stack, block, meta); + } + + @Override + public String[] toolCategories() + { + return new String[] { "weapon", "harvest", "melee", "bludgeoning" }; + } } diff --git a/mods/tinker/tconstruct/items/tools/LumberAxe.java b/mods/tinker/tconstruct/items/tools/LumberAxe.java index 32c21582..00129a1d 100644 --- a/mods/tinker/tconstruct/items/tools/LumberAxe.java +++ b/mods/tinker/tconstruct/items/tools/LumberAxe.java @@ -42,7 +42,7 @@ public class LumberAxe extends HarvestTool } @Override - public float getRepairModifier () + public float getRepairCost () { return 4.0f; } @@ -179,7 +179,7 @@ public class LumberAxe extends HarvestTool int localID = world.getBlockId(xPos, yPos, zPos); if (localID == bID && world.getBlockMetadata(xPos, yPos, zPos) % 4 == meta % 4) { - world.setBlockToAir(xPos, yPos, zPos); + world.setBlock(xPos, yPos, zPos, 0, 0, 4); if (!player.capabilities.isCreativeMode) { Block.blocksList[bID].harvestBlock(world, player, xPos, yPos, zPos, meta); @@ -248,7 +248,7 @@ public class LumberAxe extends HarvestTool @Override public Item getHeadItem () { - return TContent.lumberHead; + return TContent.broadAxeHead; } @Override @@ -260,7 +260,7 @@ public class LumberAxe extends HarvestTool @Override public Item getAccessoryItem () { - return TContent.largePlate; + return TContent.heavyPlate; } @Override diff --git a/mods/tinker/tconstruct/items/tools/Scythe.java b/mods/tinker/tconstruct/items/tools/Scythe.java index 65b74390..92980a7d 100644 --- a/mods/tinker/tconstruct/items/tools/Scythe.java +++ b/mods/tinker/tconstruct/items/tools/Scythe.java @@ -6,7 +6,7 @@ import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.ActiveToolMod; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.tools.AbilityHelper; -import mods.tinker.tconstruct.library.tools.HarvestTool; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -19,7 +19,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Scythe extends HarvestTool +public class Scythe extends Weapon { public Scythe(int itemID) { @@ -27,11 +27,11 @@ public class Scythe extends HarvestTool this.setUnlocalizedName("InfiTool.Scythe"); } - @Override + /*@Override protected String getHarvestType() { return "sword"; - } + }*/ @Override protected Material[] getEffectiveMaterials() @@ -104,7 +104,7 @@ public class Scythe extends HarvestTool } @Override - public float getRepairModifier () + public float getRepairCost () { return 4.0f; } diff --git a/mods/tinker/tconstruct/library/ActiveToolMod.java b/mods/tinker/tconstruct/library/ActiveToolMod.java index 9c2aff0a..c8060383 100644 --- a/mods/tinker/tconstruct/library/ActiveToolMod.java +++ b/mods/tinker/tconstruct/library/ActiveToolMod.java @@ -5,6 +5,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ActiveToolMod @@ -28,7 +29,7 @@ public class ActiveToolMod /* Attacking */ - public int baseAttackDamage(int earlyModDamage, int damage, ToolCore tool, ItemStack stack, EntityPlayer player, Entity entity) + public int baseAttackDamage(int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityPlayer player, Entity entity) { return 0; } @@ -39,7 +40,7 @@ public class ActiveToolMod return 0f; } - public int attackDamage(int modDamage, int currentDamage, ToolCore tool, ItemStack stack, EntityPlayer player, Entity entity) + public int attackDamage(int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityPlayer player, Entity entity) { return 0; } diff --git a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java index f059f31b..8d7b19dc 100644 --- a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import mods.tinker.tconstruct.event.ToolCraftEvent; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.tools.ToolMaterial; @@ -13,6 +14,7 @@ import mods.tinker.tconstruct.library.util.IToolPart; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; public class ToolBuilder { @@ -306,6 +308,9 @@ public class ToolBuilder compound.setCompoundTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "\u00A7f" + name); } + + ToolCraftEvent event = new ToolCraftEvent(item, compound, new ToolMaterial[] {headMat, handleMat, accessoryMat, extraMat}); + MinecraftForge.EVENT_BUS.post(event); tool.setTagCompound(compound); diff --git a/mods/tinker/tconstruct/library/tools/AbilityHelper.java b/mods/tinker/tconstruct/library/tools/AbilityHelper.java index 7e63d969..3834958b 100644 --- a/mods/tinker/tconstruct/library/tools/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/tools/AbilityHelper.java @@ -81,7 +81,7 @@ public class AbilityHelper int earlyModDamage = 0; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { - earlyModDamage = mod.baseAttackDamage(earlyModDamage, damage, tool, stack, player, entity); + earlyModDamage = mod.baseAttackDamage(earlyModDamage, damage, tool, tags, toolTags, stack, player, entity); } damage += earlyModDamage; @@ -129,7 +129,7 @@ public class AbilityHelper int modDamage = 0; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { - modDamage = mod.attackDamage(modDamage, damage, tool, stack, player, entity); + modDamage = mod.attackDamage(modDamage, damage, tool, tags, toolTags, stack, player, entity); } damage += modDamage; diff --git a/mods/tinker/tconstruct/library/tools/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java index 67397245..39f2bae8 100644 --- a/mods/tinker/tconstruct/library/tools/ToolCore.java +++ b/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -55,855 +55,877 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class ToolCore extends Item implements ICustomElectricItem, IBoxable { - protected Random random = new Random(); - protected int damageVsEntity; - public static Icon blankSprite; - public static Icon emptyIcon; - - public ToolCore(int id, int baseDamage) - { - super(id); - this.maxStackSize = 1; - this.setMaxDamage(100); - this.setUnlocalizedName("InfiTool"); - this.setCreativeTab(TConstructRegistry.toolTab); - damageVsEntity = baseDamage; - TConstructRegistry.addToolMapping(this); - setNoRepair(); - 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 - * @return type - */ - - public int durabilityTypeHandle () - { - return 1; - } - - public int durabilityTypeAccessory () - { - return 0; - } - - public int durabilityTypeExtra () - { - return 0; - } - - public int getModifierAmount () - { - return 3; - } - - public String getToolName () - { - return this.getClass().getSimpleName(); - } - - /* Rendering */ - - //public HashMap partTextures = new HashMap(); - //public HashMap effectTextures = new HashMap(); - public HashMap headIcons = new HashMap(); - public HashMap brokenHeadIcons = new HashMap(); - public HashMap handleIcons = new HashMap(); - public HashMap accessoryIcons = new HashMap(); - public HashMap effectIcons = new HashMap(); - public HashMap extraIcons = new HashMap(); - - //Not liking this - public HashMap headStrings = new HashMap(); - public HashMap brokenHeadStrings = new HashMap(); - public HashMap handleStrings = new HashMap(); - public HashMap accessoryStrings = new HashMap(); - public HashMap effectStrings = new HashMap(); - public HashMap extraStrings = new HashMap(); - - @SideOnly(Side.CLIENT) - @Override - public boolean requiresMultipleRenderPasses () - { - return true; - } - - @SideOnly(Side.CLIENT) - @Override - public int getRenderPasses (int metadata) - { - return 9; - } - - //Override me please! - public int getPartAmount () - { - return 3; - } - - public abstract String getIconSuffix (int partType); - - public abstract String getEffectSuffix (); - - public abstract String getDefaultFolder (); - - 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]); - } - - public void registerEffectPath (int index, String location) - { - effectStrings.put(index, location); - } - - @Override - public void registerIcons (IconRegister iconRegister) - { - headIcons.clear(); - brokenHeadIcons.clear(); - handleIcons.clear(); - accessoryIcons.clear(); - effectIcons.clear(); - Iterator iter = headStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - headIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - - iter = brokenHeadStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - brokenHeadIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - - iter = handleStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - handleIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - - if (getPartAmount() > 2) - { - iter = accessoryStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - accessoryIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - } - - if (getPartAmount() > 3) - { - iter = extraStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - extraIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - } - - iter = effectStrings.entrySet().iterator(); - while (iter.hasNext()) - { - Map.Entry pairs = (Map.Entry) iter.next(); - effectIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); - } - - emptyIcon = iconRegister.registerIcon("tinker:blankface"); - } - - @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 - { - return handleIcons.get(tags.getInteger("RenderHandle")); - } - - else if (renderPass == 1) // Head - { - if (tags.getBoolean("Broken")) - return (brokenHeadIcons.get(tags.getInteger("RenderHead"))); - else - 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; - } - - /* Tags and information about the tool */ - @Override - @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (!stack.hasTagCompound()) - return; - - NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) - { - String color = ""; - //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); - - if (power != 0) - { - if (power <= this.getMaxCharge(stack) / 3) - color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; - } - - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); - } - if (tags.hasKey("InfiTool")) - { - boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); - if (broken) - list.add("\u00A7oBroken"); - else - { - int head = tags.getCompoundTag("InfiTool").getInteger("Head"); - int handle = tags.getCompoundTag("InfiTool").getInteger("Handle"); - int binding = tags.getCompoundTag("InfiTool").getInteger("Accessory"); - - String headName = getAbilityNameForType(head); - if (!headName.equals("")) - list.add(getStyleForType(head) + headName); - - String handleName = getAbilityNameForType(handle); - if (!handleName.equals("") && handle != head) - list.add(getStyleForType(handle) + handleName); - - if (getPartAmount() >= 3) - { - String bindingName = getAbilityNameForType(binding); - if (!bindingName.equals("") && binding != head && binding != handle) - list.add(getStyleForType(binding) + bindingName); - } - - String reinforced = getReinforcedName(head, handle, binding); - if (!reinforced.equals("")) - list.add(reinforced); - - boolean displayToolTips = true; - int tipNum = 0; - while (displayToolTips) - { - tipNum++; - String tooltip = "Tooltip" + tipNum; - if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) - { - String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); - if (!tipName.equals("")) - list.add(tipName); - } - else - displayToolTips = false; - } - } - } - } - - public static String getStyleForType (int type) - { - return TConstructRegistry.getMaterial(type).style(); - } - - public String getAbilityNameForType (int type) - { - return TConstructRegistry.getMaterial(type).ability(); - } - - public String getReinforcedName (int head, int handle, int accessory) - { - ToolMaterial headMat = TConstructRegistry.getMaterial(head); - ToolMaterial handleMat = TConstructRegistry.getMaterial(handle); - ToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory); - - int reinforced = 0; - String style = ""; - int current = headMat.reinforced(); - if (current > 0) - { - style = headMat.style(); - reinforced = current; - } - current = handleMat.reinforced(); - if (current > 0 && current > reinforced) - { - style = handleMat.style(); - reinforced = current; - } - if (getPartAmount() >= 3) - { - current = accessoryMat.reinforced(); - if (current > 0 && current > reinforced) - { - style = accessoryMat.style(); - reinforced = current; - } - } - - if (reinforced > 0) - { - return style + getReinforcedString(reinforced); - } - return ""; - } - - String getReinforcedString (int reinforced) - { - String ret = "Reinforced "; - switch (reinforced) - { - case 1: - ret += "I"; - break; - case 2: - ret += "II"; - break; - case 3: - ret += "III"; - break; - case 4: - ret += "IV"; - break; - case 5: - ret += "V"; - break; - case 6: - ret += "VI"; - break; - case 7: - ret += "VII"; - break; - case 8: - ret += "VIII"; - break; - case 9: - ret += "IX"; - break; - default: - ret += "X"; - break; - } - return ret; - } - - //Used for sounds and the like - public void onEntityDamaged (World world, EntityPlayer player, Entity entity) - { - - } - - /* Creative mode tools */ - static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Netherrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", - "Bronze ", "Alumite ", "Steel ", "Slime " }; - - public void getSubItems (int id, CreativeTabs tab, List list) - { - for (int i = 0; i < 18; i++) - { - Item accessory = getAccessoryItem(); - ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null; - Item extra = getExtraItem(); - ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, i) : null; - ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, i), new ItemStack(getHandleItem(), 1, i), accessoryStack, extraStack, toolMaterialNames[i] + getToolName()); - if (tool == null) - System.out.println("Null tool for "+this.getToolName()); - tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true); - list.add(tool); - } - } - - public abstract Item getHeadItem (); - - public abstract Item getAccessoryItem (); - - public Item getExtraItem () - { - return null; - } - - public Item getHandleItem () - { - return TConstructRegistry.toolRod; - } - - /* Updating */ - - public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) - { - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - mod.updateTool(this, stack, world, entity); - } - } - - /* Tool uses */ - - //Types - public abstract String[] toolCategories (); - - //Mining - @Override - public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) - { - boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) - { - if (mod.beforeBlockBreak(this, stack, x, y, z, player)) - cancelHarvest = true; - } - - return cancelHarvest; - } - - @Override - public boolean onBlockDestroyed (ItemStack itemstack, World world, int blockID, int x, int y, int z, EntityLiving player) - { - return AbilityHelper.onBlockChanged(itemstack, world, blockID, x, y, z, player, random); - } - - @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) - return 0.1f; - return 1f; - } - - // Attacking - @Override - public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) - { - AbilityHelper.onLeftClickEntity(stack, player, entity, this); - return true; - } - - @Override - public boolean hitEntity (ItemStack stack, EntityLiving mob, EntityLiving player) - { - return true; - } - - public boolean pierceArmor () - { - return false; - } - - public float chargeAttack () - { - return 1f; - } - - public int getDamageVsEntity (Entity par1Entity) - { - return this.damageVsEntity; - } - - //Changes how much durability the base tool has - public float getDurabilityModifier () - { - return 1f; - } - - public float getRepairModifier () + protected Random random = new Random(); + protected int damageVsEntity; + public static Icon blankSprite; + public static Icon emptyIcon; + + public ToolCore(int id, int baseDamage) + { + super(id); + this.maxStackSize = 1; + this.setMaxDamage(100); + this.setUnlocalizedName("InfiTool"); + this.setCreativeTab(TConstructRegistry.toolTab); + damageVsEntity = baseDamage; + TConstructRegistry.addToolMapping(this); + setNoRepair(); + 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 + * @return type + */ + + public int durabilityTypeHandle () + { + return 1; + } + + public int durabilityTypeAccessory () + { + return 0; + } + + public int durabilityTypeExtra () + { + return 0; + } + + public int getModifierAmount () + { + return 3; + } + + public String getToolName () + { + return this.getClass().getSimpleName(); + } + + /* Rendering */ + + public HashMap headIcons = new HashMap(); + public HashMap brokenIcons = new HashMap(); + public HashMap handleIcons = new HashMap(); + public HashMap accessoryIcons = new HashMap(); + public HashMap effectIcons = new HashMap(); + public HashMap extraIcons = new HashMap(); + + //Not liking this + public HashMap headStrings = new HashMap(); + public HashMap brokenHeadStrings = new HashMap(); + public HashMap handleStrings = new HashMap(); + public HashMap accessoryStrings = new HashMap(); + public HashMap effectStrings = new HashMap(); + public HashMap extraStrings = new HashMap(); + + @SideOnly(Side.CLIENT) + @Override + public boolean requiresMultipleRenderPasses () + { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public int getRenderPasses (int metadata) + { + return 9; + } + + //Override me please! + public int getPartAmount () + { + return 3; + } + + public abstract String getIconSuffix (int partType); + + public abstract String getEffectSuffix (); + + public abstract String getDefaultFolder (); + + 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]); + } + + public void registerEffectPath (int index, String location) + { + effectStrings.put(index, location); + } + + @Override + public void registerIcons (IconRegister iconRegister) + { + headIcons.clear(); + brokenIcons.clear(); + handleIcons.clear(); + accessoryIcons.clear(); + effectIcons.clear(); + Iterator iter = headStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + headIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + + iter = brokenHeadStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + brokenIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + + iter = handleStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + handleIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + + if (getPartAmount() > 2) + { + iter = accessoryStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + accessoryIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + } + + if (getPartAmount() > 3) + { + iter = extraStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + extraIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + } + + iter = effectStrings.entrySet().iterator(); + while (iter.hasNext()) + { + Map.Entry pairs = (Map.Entry) iter.next(); + effectIcons.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue())); + } + + emptyIcon = iconRegister.registerIcon("tinker:blankface"); + } + + @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 + { + return handleIcons.get(tags.getInteger("RenderHandle")); + } + + else if (renderPass == 1) // Head + { + if (tags.getBoolean("Broken")) + return (brokenIcons.get(tags.getInteger("RenderHead"))); + else + 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; + } + + /* Tags and information about the tool */ + @Override + @SideOnly(Side.CLIENT) + public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + { + if (!stack.hasTagCompound()) + return; + + NBTTagCompound tags = stack.getTagCompound(); + if (tags.hasKey("charge")) + { + String color = ""; + //double joules = this.getJoules(stack); + int power = tags.getInteger("charge"); + + if (power != 0) + { + if (power <= this.getMaxCharge(stack) / 3) + color = "\u00a74"; + else if (power > this.getMaxCharge(stack) * 2 / 3) + color = "\u00a72"; + else + color = "\u00a76"; + } + + String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); + list.add(charge); + } + if (tags.hasKey("InfiTool")) + { + boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); + if (broken) + list.add("\u00A7oBroken"); + else + { + int head = tags.getCompoundTag("InfiTool").getInteger("Head"); + int handle = tags.getCompoundTag("InfiTool").getInteger("Handle"); + int binding = tags.getCompoundTag("InfiTool").getInteger("Accessory"); + int extra = tags.getCompoundTag("InfiTool").getInteger("Extra"); + + String headName = getAbilityNameForType(head); + if (!headName.equals("")) + list.add(getStyleForType(head) + headName); + + String handleName = getAbilityNameForType(handle); + if (!handleName.equals("") && handle != head) + list.add(getStyleForType(handle) + handleName); + + if (getPartAmount() >= 3) + { + String bindingName = getAbilityNameForType(binding); + if (!bindingName.equals("") && binding != head && binding != handle) + list.add(getStyleForType(binding) + bindingName); + } + + if (getPartAmount() >= 4) + { + String extraName = getAbilityNameForType(extra); + if (!extraName.equals("") && extra != head && extra != handle && extra != binding) + list.add(getStyleForType(extra) + extraName); + } + + String reinforced = getReinforcedName(head, handle, binding, extra); + if (!reinforced.equals("")) + list.add(reinforced); + + boolean displayToolTips = true; + int tipNum = 0; + while (displayToolTips) + { + tipNum++; + String tooltip = "Tooltip" + tipNum; + if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) + { + String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); + if (!tipName.equals("")) + list.add(tipName); + } + else + displayToolTips = false; + } + } + } + } + + public static String getStyleForType (int type) + { + return TConstructRegistry.getMaterial(type).style(); + } + + public String getAbilityNameForType (int type) + { + return TConstructRegistry.getMaterial(type).ability(); + } + + public String getReinforcedName (int head, int handle, int accessory, int extra) + { + ToolMaterial headMat = TConstructRegistry.getMaterial(head); + ToolMaterial handleMat = TConstructRegistry.getMaterial(handle); + ToolMaterial accessoryMat = TConstructRegistry.getMaterial(accessory); + ToolMaterial extraMat = TConstructRegistry.getMaterial(extra); + + int reinforced = 0; + String style = ""; + int current = headMat.reinforced(); + if (current > 0) + { + style = headMat.style(); + reinforced = current; + } + current = handleMat.reinforced(); + if (current > 0 && current > reinforced) + { + style = handleMat.style(); + reinforced = current; + } + if (getPartAmount() >= 3) + { + current = accessoryMat.reinforced(); + if (current > 0 && current > reinforced) + { + style = accessoryMat.style(); + reinforced = current; + } + } + if (getPartAmount() >= 4) + { + current = extraMat.reinforced(); + if (current > 0 && current > reinforced) + { + style = extraMat.style(); + reinforced = current; + } + } + + if (reinforced > 0) + { + return style + getReinforcedString(reinforced); + } + return ""; + } + + String getReinforcedString (int reinforced) + { + String ret = "Reinforced "; + switch (reinforced) + { + case 1: + ret += "I"; + break; + case 2: + ret += "II"; + break; + case 3: + ret += "III"; + break; + case 4: + ret += "IV"; + break; + case 5: + ret += "V"; + break; + case 6: + ret += "VI"; + break; + case 7: + ret += "VII"; + break; + case 8: + ret += "VIII"; + break; + case 9: + ret += "IX"; + break; + default: + ret += "X"; + break; + } + return ret; + } + + //Used for sounds and the like + public void onEntityDamaged (World world, EntityPlayer player, Entity entity) + { + + } + + /* Creative mode tools */ + static String[] toolMaterialNames = { "Wooden ", "Stone ", "Iron ", "Flint ", "Cactus ", "Bone ", "Obsidian ", "Netherrack ", "Slime ", "Paper ", "Cobalt ", "Ardite ", "Manyullyn ", "Copper ", + "Bronze ", "Alumite ", "Steel ", "Slime " }; + + public void getSubItems (int id, CreativeTabs tab, List list) + { + for (int i = 0; i < 18; i++) + { + Item accessory = getAccessoryItem(); + ItemStack accessoryStack = accessory != null ? new ItemStack(getAccessoryItem(), 1, i) : null; + Item extra = getExtraItem(); + ItemStack extraStack = extra != null ? new ItemStack(getExtraItem(), 1, i) : null; + ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, i), new ItemStack(getHandleItem(), 1, i), accessoryStack, extraStack, toolMaterialNames[i] + getToolName()); + if (tool == null) + { + System.out.println("Creative builder failed tool for "+toolMaterialNames[i] + 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); + } + } + } + + public abstract Item getHeadItem (); + + public abstract Item getAccessoryItem (); + + public Item getExtraItem () + { + return null; + } + + public Item getHandleItem () + { + return TConstructRegistry.toolRod; + } + + /* Updating */ + + public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) + { + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + mod.updateTool(this, stack, world, entity); + } + } + + /* Tool uses */ + + //Types + public abstract String[] toolCategories (); + + //Mining + @Override + public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) + { + boolean cancelHarvest = false; + for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + { + if (mod.beforeBlockBreak(this, stack, x, y, z, player)) + cancelHarvest = true; + } + + return cancelHarvest; + } + + @Override + public boolean onBlockDestroyed (ItemStack itemstack, World world, int blockID, int x, int y, int z, EntityLiving player) + { + return AbilityHelper.onBlockChanged(itemstack, world, blockID, x, y, z, player, random); + } + + @Override + public float getStrVsBlock (ItemStack stack, Block block, int meta) + { + NBTTagCompound tags = stack.getTagCompound(); + if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) + return 0.1f; + return 1f; + } + + // Attacking + @Override + public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity) + { + AbilityHelper.onLeftClickEntity(stack, player, entity, this); + return true; + } + + @Override + public boolean hitEntity (ItemStack stack, EntityLiving mob, EntityLiving player) + { + return true; + } + + public boolean pierceArmor () + { + return false; + } + + public float chargeAttack () + { + return 1f; + } + + public int getDamageVsEntity (Entity par1Entity) + { + return this.damageVsEntity; + } + + //Changes how much durability the base tool has + public float getDurabilityModifier () + { + return 1f; + } + + public float getRepairCost () { return getDurabilityModifier(); } - public float getDamageModifier () - { - return 1.0f; - } + public float getDamageModifier () + { + return 1.0f; + } - //Right-click - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) - { - //Workaround for impossible crash? - if (!player.isSneaking()) - { - Block block = Block.blocksList[world.getBlockId(x, y, z)]; - if (block.hasTileEntity(world.getBlockMetadata(x, y, z))) - { - return false; - } - } + //Right-click + public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float clickX, float clickY, float clickZ) + { + //Workaround for impossible crash? + if (!player.isSneaking()) + { + Block block = Block.blocksList[world.getBlockId(x, y, z)]; + if (block.hasTileEntity(world.getBlockMetadata(x, y, z))) + { + return false; + } + } - int posX = x; - int posY = y; - int posZ = z; - int playerPosX = (int) Math.floor(player.posX); - int playerPosY = (int) Math.floor(player.posY); - int playerPosZ = (int) Math.floor(player.posZ); - if (side == 0) - { - --posY; - } + int posX = x; + int posY = y; + int posZ = z; + int playerPosX = (int) Math.floor(player.posX); + int playerPosY = (int) Math.floor(player.posY); + int playerPosZ = (int) Math.floor(player.posZ); + if (side == 0) + { + --posY; + } - if (side == 1) - { - ++posY; - } + if (side == 1) + { + ++posY; + } - if (side == 2) - { - --posZ; - } + if (side == 2) + { + --posZ; + } - if (side == 3) - { - ++posZ; - } + if (side == 3) + { + ++posZ; + } - if (side == 4) - { - --posX; - } + if (side == 4) + { + --posX; + } - if (side == 5) - { - ++posX; - } - if (posX == playerPosX && (posY == playerPosY || posY == playerPosY + 1 || posY == playerPosY - 1) && posZ == playerPosZ) - { - return false; - } + if (side == 5) + { + ++posX; + } + if (posX == playerPosX && (posY == playerPosY || posY == playerPosY + 1 || posY == playerPosY - 1) && posZ == playerPosZ) + { + return false; + } - int hotbarSlot = player.inventory.currentItem; - if (hotbarSlot == 0) - { - ItemStack next = player.inventory.getStackInSlot(8); - if (next != null && next.getItem() instanceof ItemBlock) - { - next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); - if (next.stackSize < 1) - player.inventory.setInventorySlotContents(8, null); - } - } - else if (hotbarSlot < 8) - { - ItemStack next = player.inventory.getStackInSlot(hotbarSlot + 1); - if (next != null && next.getItem() instanceof ItemBlock) - { - next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); - if (next.stackSize < 1) - player.inventory.setInventorySlotContents(hotbarSlot + 1, null); - } - } - return false; - } + int hotbarSlot = player.inventory.currentItem; + if (hotbarSlot == 0) + { + ItemStack next = player.inventory.getStackInSlot(8); + if (next != null && next.getItem() instanceof ItemBlock) + { + next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); + if (next.stackSize < 1) + player.inventory.setInventorySlotContents(8, null); + } + } + else if (hotbarSlot < 8) + { + ItemStack next = player.inventory.getStackInSlot(hotbarSlot + 1); + if (next != null && next.getItem() instanceof ItemBlock) + { + next.getItem().onItemUse(next, player, world, x, y, z, side, clickX, clickY, clickZ); + if (next.stackSize < 1) + player.inventory.setInventorySlotContents(hotbarSlot + 1, null); + } + } + return false; + } - /* IC2 Support - * Every tool can be an electric tool if you modify it right - */ - @Override - public boolean canBeStoredInToolbox (ItemStack stack) - { - return true; - } + /* IC2 Support + * Every tool can be an electric tool if you modify it right + */ + @Override + public boolean canBeStoredInToolbox (ItemStack stack) + { + return true; + } - @Override - public boolean canProvideEnergy (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return false; + @Override + public boolean canProvideEnergy (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.hasKey("charge")) + return false; - return true; - } + return true; + } - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } + @Override + public int getChargedItemId (ItemStack stack) + { + return this.itemID; + } - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } + @Override + public int getEmptyItemId (ItemStack stack) + { + return this.itemID; + } - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; + @Override + public int getMaxCharge (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.hasKey("charge")) + return 0; - return 10000; - } + return 10000; + } - @Override - public int getTier (ItemStack itemStack) - { - return 0; - } + @Override + public int getTier (ItemStack itemStack) + { + return 0; + } - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; + @Override + public int getTransferLimit (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.hasKey("charge")) + return 0; - return 32; - } + return 32; + } - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; + @Override + public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) + { + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.hasKey("charge")) + return 0; - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } + if (amount > 0) + { + if (amount > getTransferLimit(stack) && !ignoreTransferLimit) + { + amount = getTransferLimit(stack); + } - int charge = tags.getInteger("charge"); + int charge = tags.getInteger("charge"); - if (amount > getMaxCharge(stack) - charge) - { - amount = getMaxCharge(stack) - charge; - } + if (amount > getMaxCharge(stack) - charge) + { + amount = getMaxCharge(stack) - charge; + } - charge += amount; + charge += amount; - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } + if (!simulate) + { + tags.setInteger("charge", charge); + stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); + } - return amount; - } + return amount; + } - else - return 0; - } + else + return 0; + } - @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; + @Override + public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) + { + NBTTagCompound tags = stack.getTagCompound(); + if (!tags.hasKey("charge")) + return 0; - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } + if (amount > 0) + { + if (amount > getTransferLimit(stack) && !ignoreTransferLimit) + { + amount = getTransferLimit(stack); + } - int charge = tags.getInteger("charge"); + int charge = tags.getInteger("charge"); - if (amount > charge) - { - amount = charge; - } + if (amount > charge) + { + amount = charge; + } - charge -= amount; + charge -= amount; - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } + if (!simulate) + { + tags.setInteger("charge", charge); + stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); + } - return amount; - } + return amount; + } - else - return 0; - } + else + return 0; + } - @Override - public boolean canShowChargeToolTip (ItemStack itemStack) - { - return false; - } + @Override + public boolean canShowChargeToolTip (ItemStack itemStack) + { + return false; + } - @Override - public boolean canUse (ItemStack itemStack, int amount) - { - return false; - } + @Override + public boolean canUse (ItemStack itemStack, int amount) + { + return false; + } - //Vanilla overrides - public boolean isItemTool (ItemStack par1ItemStack) - { - return false; - } + //Vanilla overrides + public boolean isItemTool (ItemStack par1ItemStack) + { + return false; + } - @Override - public boolean getIsRepairable (ItemStack par1ItemStack, ItemStack par2ItemStack) - { - return false; - } + @Override + public boolean getIsRepairable (ItemStack par1ItemStack, ItemStack par2ItemStack) + { + return false; + } - public boolean isRepairable () - { - return false; - } + public boolean isRepairable () + { + return false; + } - public int getItemEnchantability () - { - return 0; - } + public int getItemEnchantability () + { + return 0; + } - public boolean isFull3D () - { - return true; - } + public boolean isFull3D () + { + return true; + } - /* Proper stack damage */ - public int getItemDamageFromStack (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { - //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); - //Exception e = new NullPointerException(); - //e.printStackTrace(); - return 0; - } + /* Proper stack damage */ + public int getItemDamageFromStack (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (tags == null) + { + //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); + //Exception e = new NullPointerException(); + //e.printStackTrace(); + return 0; + } - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) + if (tags.hasKey("charge")) + { + int charge = tags.getInteger("charge"); + if (charge > 0) return getMaxCharge(stack) - charge; - } - return tags.getCompoundTag("InfiTool").getInteger("Damage"); - } + } + return tags.getCompoundTag("InfiTool").getInteger("Damage"); + } - public int getItemDamageFromStackForDisplay (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { - //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); - //Exception e = new NullPointerException(); - //e.printStackTrace(); - return 0; - } + public int getItemDamageFromStackForDisplay (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (tags == null) + { + //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); + //Exception e = new NullPointerException(); + //e.printStackTrace(); + return 0; + } - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return getMaxCharge(stack) - charge; - } - return tags.getCompoundTag("InfiTool").getInteger("Damage"); - } + if (tags.hasKey("charge")) + { + int charge = tags.getInteger("charge"); + if (charge > 0) + return getMaxCharge(stack) - charge; + } + return tags.getCompoundTag("InfiTool").getInteger("Damage"); + } - public int getItemMaxDamageFromStack (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags == null) - { - //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); - //Exception e = new NullPointerException(); - //e.printStackTrace(); - return 0; - } + public int getItemMaxDamageFromStack (ItemStack stack) + { + NBTTagCompound tags = stack.getTagCompound(); + if (tags == null) + { + //System.out.println("Tool item is uninitalized! This method should never be called with a default item"); + //Exception e = new NullPointerException(); + //e.printStackTrace(); + return 0; + } - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return this.getMaxCharge(stack); - } - return tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); - } + if (tags.hasKey("charge")) + { + int charge = tags.getInteger("charge"); + if (charge > 0) + return this.getMaxCharge(stack); + } + return tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); + } } diff --git a/mods/tinker/tconstruct/modifiers/ModRepair.java b/mods/tinker/tconstruct/modifiers/ModRepair.java index b024ca3e..52a05c93 100644 --- a/mods/tinker/tconstruct/modifiers/ModRepair.java +++ b/mods/tinker/tconstruct/modifiers/ModRepair.java @@ -2,6 +2,7 @@ package mods.tinker.tconstruct.modifiers; import mods.tinker.tconstruct.library.crafting.PatternBuilder; import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -80,7 +81,7 @@ public class ModRepair extends ToolMod if (repairCount < 0.5f) repairCount = 0.5f; increase *= repairCount; - increase /= tool.getRepairCost(); + increase /= ((ToolCore) tool.getItem()).getRepairCost(); damage -= increase; if (damage < 0) diff --git a/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java b/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java index f703b258..7f4d9dbf 100644 --- a/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java +++ b/mods/tinker/tconstruct/modifiers/TActiveOmniMod.java @@ -148,10 +148,21 @@ public class TActiveOmniMod extends ActiveToolMod /* Attacking */ @Override - public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, ItemStack stack, EntityPlayer player, Entity entity) + public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityPlayer player, Entity entity) { if (tool instanceof Weapon) TContent.modL.midStreamModify(stack); return 0; } + + @Override + public int attackDamage(int modDamage, int currentDamage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityPlayer player, Entity entity) + { + if (toolTags.hasKey("Smite")) + { + int level = toolTags.getInteger("Smite"); + int bonus = random.nextInt(level*2+1) + level*2; + } + return 0; + } } diff --git a/mods/tinker/tconstruct/util/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java index 48afd763..ae6a9911 100644 --- a/mods/tinker/tconstruct/util/PHConstruct.java +++ b/mods/tinker/tconstruct/util/PHConstruct.java @@ -123,6 +123,7 @@ public class PHConstruct largeSwordBlade = config.getItem("Tool Parts", "Large Sword Blade", 14043).getInt(14043); largePlate = config.getItem("Tool Parts", "Large Plate", 14044).getInt(14044); excavatorHead = config.getItem("Tool Parts", "Excavator Head", 14045).getInt(14045); + hammerHead = config.getItem("Tool Parts", "Hammer Head", 14046).getInt(14046); pickaxe = config.getItem("Tools", "Pickaxe", 14051).getInt(14051); shovel = config.getItem("Tools", "Shovel", 14052).getInt(14052); @@ -146,6 +147,8 @@ public class PHConstruct scythe = config.getItem("Tools", "Scythe", 14067).getInt(14067); cleaver = config.getItem("Tools", "Cleaver", 14068).getInt(14068); excavator = config.getItem("Tools", "Excavator", 14069).getInt(14069); + hammer = config.getItem("Tools", "Hammer", 14070).getInt(14070); + battleaxe = config.getItem("Tools", "Battleaxe", 14071).getInt(14071); buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); @@ -322,6 +325,8 @@ public class PHConstruct public static int scythe; public static int cleaver; public static int excavator; + public static int hammer; + public static int battleaxe; public static int chisel; @@ -345,6 +350,7 @@ public class PHConstruct public static int lumberHead; public static int largeSwordBlade; public static int excavatorHead; + public static int hammerHead; public static int binding; public static int toughBinding; diff --git a/mods/tinker/tconstruct/util/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java index 6c3d6907..88323e6a 100644 --- a/mods/tinker/tconstruct/util/TEventHandler.java +++ b/mods/tinker/tconstruct/util/TEventHandler.java @@ -6,12 +6,14 @@ import java.util.Random; import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.event.ToolCraftEvent; 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.modifiers.ModAttack; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityGhast; @@ -40,6 +42,21 @@ public class TEventHandler { Random random = new Random(); + /* Crafting */ + @ForgeSubscribe + public void craftTool (ToolCraftEvent event) + { + if (event.tool == TContent.hammer) + { + event.toolTag.setInteger("Smite", 2); + } + + if (event.tool == TContent.cleaver) + { + event.toolTag.setInteger("Beheading", 2); + } + } + /* Interact */ /*@ForgeSubscribe @@ -80,6 +97,14 @@ public class TEventHandler event.drops.add(entityitem); } + if (event.entityLiving instanceof EntityWither && random.nextInt(5) == 0) + { + ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1); + EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack); + entityitem.delayBeforeCanPickup = 10; + event.drops.add(entityitem); + } + if (event.entityLiving.worldObj.getGameRules().getGameRuleBooleanValue("doMobLoot")) { if (!event.entityLiving.isChild()) @@ -109,18 +134,22 @@ public class TEventHandler { if (event.entityLiving.getClass() == EntitySkeleton.class) { - EntitySkeleton skeleton = (EntitySkeleton) event.entityLiving; + EntitySkeleton enemy = (EntitySkeleton) event.entityLiving; if (event.source.damageType.equals("player")) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading + if (stack.hasTagCompound()) { - addDrops(event, new ItemStack(Item.skull.itemID, 1, skeleton.getSkeletonType())); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (beheading > 0 && random.nextInt(100) < beheading * 10) + { + addDrops(event, new ItemStack(Item.skull.itemID, 1, enemy.getSkeletonType())); + } } } - if (skeleton.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) + if (enemy.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0) { addDrops(event, new ItemStack(TContent.materials, 1, 8)); } @@ -134,10 +163,19 @@ public class TEventHandler { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading + + if (stack.hasTagCompound()) + { + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (beheading > 0 && random.nextInt(100) < beheading * 10) + { + addDrops(event, new ItemStack(Item.skull.itemID, 1, 2)); + } + } + /*if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading { addDrops(event, new ItemStack(Item.skull.itemID, 1, 2)); - } + }*/ } } @@ -149,13 +187,17 @@ public class TEventHandler { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading + if (stack.hasTagCompound()) { - addDrops(event, new ItemStack(Item.skull.itemID, 1, 4)); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (beheading > 0 && random.nextInt(100) < beheading * 5) + { + addDrops(event, new ItemStack(Item.skull.itemID, 1, 4)); + } } } } - + if (event.entityLiving instanceof EntityPlayer) { EntityPlayer enemy = (EntityPlayer) event.entityLiving; @@ -164,13 +206,16 @@ public class TEventHandler { EntityPlayer player = (EntityPlayer) event.source.getEntity(); ItemStack stack = player.getCurrentEquippedItem(); - if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading + if (stack.hasTagCompound()) { - ItemStack dropStack = new ItemStack(Item.skull.itemID, 1, 3); - NBTTagCompound nametag = new NBTTagCompound(); - nametag.setString("SkullOwner", enemy.username); - //par1ItemStack.getTagCompound().getString("SkullOwner"); - addDrops(event, dropStack); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if (beheading > 0 && random.nextInt(100) < beheading * 50) + { + ItemStack dropStack = new ItemStack(Item.skull.itemID, 1, 3); + NBTTagCompound nametag = new NBTTagCompound(); + nametag.setString("SkullOwner", enemy.username); + addDrops(event, dropStack); + } } } } diff --git a/mods/tinker/textures/armor/enderpearl.png b/mods/tinker/textures/armor/enderpearl.png index 76978cc3..d1d08401 100644 Binary files a/mods/tinker/textures/armor/enderpearl.png and b/mods/tinker/textures/armor/enderpearl.png differ diff --git a/mods/tinker/textures/armor/wood_1.png b/mods/tinker/textures/armor/wood_1.png index d599ecbc..5a0f9cfc 100644 Binary files a/mods/tinker/textures/armor/wood_1.png and b/mods/tinker/textures/armor/wood_1.png differ diff --git a/mods/tinker/textures/armor/wood_2.png b/mods/tinker/textures/armor/wood_2.png index f02f0eac..c1326a60 100644 Binary files a/mods/tinker/textures/armor/wood_2.png and b/mods/tinker/textures/armor/wood_2.png differ diff --git a/mods/tinker/textures/blocks/blockcast_bottom.png b/mods/tinker/textures/blocks/blockcast_bottom.png index 4593cc72..9e0b3c11 100644 Binary files a/mods/tinker/textures/blocks/blockcast_bottom.png and b/mods/tinker/textures/blocks/blockcast_bottom.png differ diff --git a/mods/tinker/textures/blocks/blockcast_side.png b/mods/tinker/textures/blocks/blockcast_side.png index cfeb5a76..d858c16f 100644 Binary files a/mods/tinker/textures/blocks/blockcast_side.png and b/mods/tinker/textures/blocks/blockcast_side.png differ diff --git a/mods/tinker/textures/blocks/blockcast_top.png b/mods/tinker/textures/blocks/blockcast_top.png index 9ad1a47b..e296cc01 100644 Binary files a/mods/tinker/textures/blocks/blockcast_top.png and b/mods/tinker/textures/blocks/blockcast_top.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_blueslime.png b/mods/tinker/textures/blocks/bricks/brick_blueslime.png index 84e28b48..a0ac9cd7 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_blueslime.png and b/mods/tinker/textures/blocks/bricks/brick_blueslime.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_bone.png b/mods/tinker/textures/blocks/bricks/brick_bone.png index cbb42d0e..d064110d 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_bone.png and b/mods/tinker/textures/blocks/bricks/brick_bone.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_clay.png b/mods/tinker/textures/blocks/bricks/brick_clay.png index 05302802..1cefd653 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_clay.png and b/mods/tinker/textures/blocks/bricks/brick_clay.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_endstone.png b/mods/tinker/textures/blocks/bricks/brick_endstone.png index 6dfc6b44..5d304b85 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_endstone.png and b/mods/tinker/textures/blocks/bricks/brick_endstone.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_lapis.png b/mods/tinker/textures/blocks/bricks/brick_lapis.png index c5c78f4e..b8137256 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_lapis.png and b/mods/tinker/textures/blocks/bricks/brick_lapis.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_obsidian_ingot.png b/mods/tinker/textures/blocks/bricks/brick_obsidian_ingot.png index 0f22c4dd..2e2ae1f5 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_obsidian_ingot.png and b/mods/tinker/textures/blocks/bricks/brick_obsidian_ingot.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_sandstone.png b/mods/tinker/textures/blocks/bricks/brick_sandstone.png index 5b4b96d4..7fd3e037 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_sandstone.png and b/mods/tinker/textures/blocks/bricks/brick_sandstone.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_slime.png b/mods/tinker/textures/blocks/bricks/brick_slime.png index 2680734a..142fe62b 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_slime.png and b/mods/tinker/textures/blocks/bricks/brick_slime.png differ diff --git a/mods/tinker/textures/blocks/bricks/brick_snow.png b/mods/tinker/textures/blocks/bricks/brick_snow.png index 64ffab45..b7da9bfa 100644 Binary files a/mods/tinker/textures/blocks/bricks/brick_snow.png and b/mods/tinker/textures/blocks/bricks/brick_snow.png differ diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_clay.png b/mods/tinker/textures/blocks/bricks/fancybrick_clay.png index 2925dc3f..16cc6597 100644 Binary files a/mods/tinker/textures/blocks/bricks/fancybrick_clay.png and b/mods/tinker/textures/blocks/bricks/fancybrick_clay.png differ diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_netherrack.png b/mods/tinker/textures/blocks/bricks/fancybrick_netherrack.png index 94853227..73861772 100644 Binary files a/mods/tinker/textures/blocks/bricks/fancybrick_netherrack.png and b/mods/tinker/textures/blocks/bricks/fancybrick_netherrack.png differ diff --git a/mods/tinker/textures/blocks/bricks/fancybrick_sandstone.png b/mods/tinker/textures/blocks/bricks/fancybrick_sandstone.png index a2269474..6e19caae 100644 Binary files a/mods/tinker/textures/blocks/bricks/fancybrick_sandstone.png and b/mods/tinker/textures/blocks/bricks/fancybrick_sandstone.png differ diff --git a/mods/tinker/textures/blocks/bricks/paver_largeclay.png b/mods/tinker/textures/blocks/bricks/paver_largeclay.png index 64cc9c36..51105e11 100644 Binary files a/mods/tinker/textures/blocks/bricks/paver_largeclay.png and b/mods/tinker/textures/blocks/bricks/paver_largeclay.png differ diff --git a/mods/tinker/textures/blocks/bricks/refined_netherrack.png b/mods/tinker/textures/blocks/bricks/refined_netherrack.png index cf0bc0d2..c906253f 100644 Binary files a/mods/tinker/textures/blocks/bricks/refined_netherrack.png and b/mods/tinker/textures/blocks/bricks/refined_netherrack.png differ diff --git a/mods/tinker/textures/blocks/bricks/refined_sandstone.png b/mods/tinker/textures/blocks/bricks/refined_sandstone.png index bb5b157d..74838777 100644 Binary files a/mods/tinker/textures/blocks/bricks/refined_sandstone.png and b/mods/tinker/textures/blocks/bricks/refined_sandstone.png differ diff --git a/mods/tinker/textures/blocks/brownstone_rough_road.png b/mods/tinker/textures/blocks/brownstone_rough_road.png index df1a8aa2..95a591b8 100644 Binary files a/mods/tinker/textures/blocks/brownstone_rough_road.png and b/mods/tinker/textures/blocks/brownstone_rough_road.png differ diff --git a/mods/tinker/textures/blocks/brownstone_smooth_fancy.png b/mods/tinker/textures/blocks/brownstone_smooth_fancy.png index 2420291c..6f12a078 100644 Binary files a/mods/tinker/textures/blocks/brownstone_smooth_fancy.png and b/mods/tinker/textures/blocks/brownstone_smooth_fancy.png differ diff --git a/mods/tinker/textures/blocks/compressed_alubrass.png b/mods/tinker/textures/blocks/compressed_alubrass.png index 90f0aca6..9f76af18 100644 Binary files a/mods/tinker/textures/blocks/compressed_alubrass.png and b/mods/tinker/textures/blocks/compressed_alubrass.png differ diff --git a/mods/tinker/textures/blocks/compressed_aluminum.png b/mods/tinker/textures/blocks/compressed_aluminum.png index 17a4720f..3907f123 100644 Binary files a/mods/tinker/textures/blocks/compressed_aluminum.png and b/mods/tinker/textures/blocks/compressed_aluminum.png differ diff --git a/mods/tinker/textures/blocks/compressed_steel.png b/mods/tinker/textures/blocks/compressed_steel.png index 02197ac7..7ca3c4a3 100644 Binary files a/mods/tinker/textures/blocks/compressed_steel.png and b/mods/tinker/textures/blocks/compressed_steel.png differ diff --git a/mods/tinker/textures/blocks/consecratedsoil.png b/mods/tinker/textures/blocks/consecratedsoil.png new file mode 100644 index 00000000..06292635 Binary files /dev/null and b/mods/tinker/textures/blocks/consecratedsoil.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_aluminum_fast.png b/mods/tinker/textures/blocks/crops/berry_aluminum_fast.png index cc3a55b7..0578e67f 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_aluminum_fast.png and b/mods/tinker/textures/blocks/crops/berry_aluminum_fast.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png index c33e9ba5..168563c5 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png and b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fancy.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png index f0ef44b3..6bc536e7 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png and b/mods/tinker/textures/blocks/crops/berry_gold_ripe_fast.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_silver_fancy.png b/mods/tinker/textures/blocks/crops/berry_silver_fancy.png index ec07aca4..f3f48375 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_silver_fancy.png and b/mods/tinker/textures/blocks/crops/berry_silver_fancy.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_silver_fast.png b/mods/tinker/textures/blocks/crops/berry_silver_fast.png index 23cd387a..03cb9499 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_silver_fast.png and b/mods/tinker/textures/blocks/crops/berry_silver_fast.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png index eff21d1a..f9a7913a 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png and b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fancy.png differ diff --git a/mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png index 2722bd94..654c9dc4 100644 Binary files a/mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png and b/mods/tinker/textures/blocks/crops/berry_silver_ripe_fast.png differ diff --git a/mods/tinker/textures/blocks/golemhead_face.png b/mods/tinker/textures/blocks/golemhead_face.png index 265c8478..347bf8b6 100644 Binary files a/mods/tinker/textures/blocks/golemhead_face.png and b/mods/tinker/textures/blocks/golemhead_face.png differ diff --git a/mods/tinker/textures/blocks/golemhead_side.png b/mods/tinker/textures/blocks/golemhead_side.png index 27634f02..76cc0094 100644 Binary files a/mods/tinker/textures/blocks/golemhead_side.png and b/mods/tinker/textures/blocks/golemhead_side.png differ diff --git a/mods/tinker/textures/blocks/golemhead_top.png b/mods/tinker/textures/blocks/golemhead_top.png index ac18aca2..91f23025 100644 Binary files a/mods/tinker/textures/blocks/golemhead_top.png and b/mods/tinker/textures/blocks/golemhead_top.png differ diff --git a/mods/tinker/textures/blocks/graveyardsoil.png b/mods/tinker/textures/blocks/graveyardsoil.png new file mode 100644 index 00000000..06292635 Binary files /dev/null and b/mods/tinker/textures/blocks/graveyardsoil.png differ diff --git a/mods/tinker/textures/blocks/liquid_alubrass.png b/mods/tinker/textures/blocks/liquid_alubrass.png index ff287289..66969e3b 100644 Binary files a/mods/tinker/textures/blocks/liquid_alubrass.png and b/mods/tinker/textures/blocks/liquid_alubrass.png differ diff --git a/mods/tinker/textures/blocks/liquid_alubrass_flow.png b/mods/tinker/textures/blocks/liquid_alubrass_flow.png index 51304f6e..7c8f5460 100644 Binary files a/mods/tinker/textures/blocks/liquid_alubrass_flow.png and b/mods/tinker/textures/blocks/liquid_alubrass_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_aluminum.png b/mods/tinker/textures/blocks/liquid_aluminum.png index 83d58c8b..d76521bc 100644 Binary files a/mods/tinker/textures/blocks/liquid_aluminum.png and b/mods/tinker/textures/blocks/liquid_aluminum.png differ diff --git a/mods/tinker/textures/blocks/liquid_aluminum_flow.png b/mods/tinker/textures/blocks/liquid_aluminum_flow.png index 63b8f5f4..65ab6e68 100644 Binary files a/mods/tinker/textures/blocks/liquid_aluminum_flow.png and b/mods/tinker/textures/blocks/liquid_aluminum_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_alumite.png b/mods/tinker/textures/blocks/liquid_alumite.png index 294ce53d..eecac258 100644 Binary files a/mods/tinker/textures/blocks/liquid_alumite.png and b/mods/tinker/textures/blocks/liquid_alumite.png differ diff --git a/mods/tinker/textures/blocks/liquid_alumite_flow.png b/mods/tinker/textures/blocks/liquid_alumite_flow.png index 407bb15d..e3158349 100644 Binary files a/mods/tinker/textures/blocks/liquid_alumite_flow.png and b/mods/tinker/textures/blocks/liquid_alumite_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_ardite.png b/mods/tinker/textures/blocks/liquid_ardite.png index d45a495c..612cd15c 100644 Binary files a/mods/tinker/textures/blocks/liquid_ardite.png and b/mods/tinker/textures/blocks/liquid_ardite.png differ diff --git a/mods/tinker/textures/blocks/liquid_ardite_flow.png b/mods/tinker/textures/blocks/liquid_ardite_flow.png index eba66a7b..4aaa0ebc 100644 Binary files a/mods/tinker/textures/blocks/liquid_ardite_flow.png and b/mods/tinker/textures/blocks/liquid_ardite_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_bronze.png b/mods/tinker/textures/blocks/liquid_bronze.png index b3d91d26..19ffe5fe 100644 Binary files a/mods/tinker/textures/blocks/liquid_bronze.png and b/mods/tinker/textures/blocks/liquid_bronze.png differ diff --git a/mods/tinker/textures/blocks/liquid_bronze_flow.png b/mods/tinker/textures/blocks/liquid_bronze_flow.png index b6b0c090..438554ea 100644 Binary files a/mods/tinker/textures/blocks/liquid_bronze_flow.png and b/mods/tinker/textures/blocks/liquid_bronze_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_cobalt.png b/mods/tinker/textures/blocks/liquid_cobalt.png index d69c2768..9b36a5c8 100644 Binary files a/mods/tinker/textures/blocks/liquid_cobalt.png and b/mods/tinker/textures/blocks/liquid_cobalt.png differ diff --git a/mods/tinker/textures/blocks/liquid_cobalt_flow.png b/mods/tinker/textures/blocks/liquid_cobalt_flow.png index 37a7b257..0128698a 100644 Binary files a/mods/tinker/textures/blocks/liquid_cobalt_flow.png and b/mods/tinker/textures/blocks/liquid_cobalt_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_copper.png b/mods/tinker/textures/blocks/liquid_copper.png index d2dd55b8..677675c8 100644 Binary files a/mods/tinker/textures/blocks/liquid_copper.png and b/mods/tinker/textures/blocks/liquid_copper.png differ diff --git a/mods/tinker/textures/blocks/liquid_copper_flow.png b/mods/tinker/textures/blocks/liquid_copper_flow.png index c9166b08..7447e093 100644 Binary files a/mods/tinker/textures/blocks/liquid_copper_flow.png and b/mods/tinker/textures/blocks/liquid_copper_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_gold.png b/mods/tinker/textures/blocks/liquid_gold.png index 631e7d2f..7489b2f1 100644 Binary files a/mods/tinker/textures/blocks/liquid_gold.png and b/mods/tinker/textures/blocks/liquid_gold.png differ diff --git a/mods/tinker/textures/blocks/liquid_gold_flow.png b/mods/tinker/textures/blocks/liquid_gold_flow.png index 07551973..4d1c416c 100644 Binary files a/mods/tinker/textures/blocks/liquid_gold_flow.png and b/mods/tinker/textures/blocks/liquid_gold_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_iron.png b/mods/tinker/textures/blocks/liquid_iron.png index b78d481b..a545926c 100644 Binary files a/mods/tinker/textures/blocks/liquid_iron.png and b/mods/tinker/textures/blocks/liquid_iron.png differ diff --git a/mods/tinker/textures/blocks/liquid_iron_flow.png b/mods/tinker/textures/blocks/liquid_iron_flow.png index 5feef48e..89fc52b7 100644 Binary files a/mods/tinker/textures/blocks/liquid_iron_flow.png and b/mods/tinker/textures/blocks/liquid_iron_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_manyullyn.png b/mods/tinker/textures/blocks/liquid_manyullyn.png index 1fb728ba..c75e7b0b 100644 Binary files a/mods/tinker/textures/blocks/liquid_manyullyn.png and b/mods/tinker/textures/blocks/liquid_manyullyn.png differ diff --git a/mods/tinker/textures/blocks/liquid_manyullyn_flow.png b/mods/tinker/textures/blocks/liquid_manyullyn_flow.png index e24fb364..b6312db0 100644 Binary files a/mods/tinker/textures/blocks/liquid_manyullyn_flow.png and b/mods/tinker/textures/blocks/liquid_manyullyn_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_obsidian.png b/mods/tinker/textures/blocks/liquid_obsidian.png index e5b5abb3..7e26ee2a 100644 Binary files a/mods/tinker/textures/blocks/liquid_obsidian.png and b/mods/tinker/textures/blocks/liquid_obsidian.png differ diff --git a/mods/tinker/textures/blocks/liquid_obsidian_flow.png b/mods/tinker/textures/blocks/liquid_obsidian_flow.png index b8ae84f0..e4841463 100644 Binary files a/mods/tinker/textures/blocks/liquid_obsidian_flow.png and b/mods/tinker/textures/blocks/liquid_obsidian_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_steel.png b/mods/tinker/textures/blocks/liquid_steel.png index bc482e90..7b01f826 100644 Binary files a/mods/tinker/textures/blocks/liquid_steel.png and b/mods/tinker/textures/blocks/liquid_steel.png differ diff --git a/mods/tinker/textures/blocks/liquid_steel_flow.png b/mods/tinker/textures/blocks/liquid_steel_flow.png index a278db34..4074cabb 100644 Binary files a/mods/tinker/textures/blocks/liquid_steel_flow.png and b/mods/tinker/textures/blocks/liquid_steel_flow.png differ diff --git a/mods/tinker/textures/blocks/liquid_tin.png b/mods/tinker/textures/blocks/liquid_tin.png index be3e3233..2dcd87c1 100644 Binary files a/mods/tinker/textures/blocks/liquid_tin.png and b/mods/tinker/textures/blocks/liquid_tin.png differ diff --git a/mods/tinker/textures/blocks/liquid_tin_flow.png b/mods/tinker/textures/blocks/liquid_tin_flow.png index 139d6743..19480040 100644 Binary files a/mods/tinker/textures/blocks/liquid_tin_flow.png and b/mods/tinker/textures/blocks/liquid_tin_flow.png differ diff --git a/mods/tinker/textures/blocks/ore_aluminum_gravel.png b/mods/tinker/textures/blocks/ore_aluminum_gravel.png index 35fbd54f..1595d67f 100644 Binary files a/mods/tinker/textures/blocks/ore_aluminum_gravel.png and b/mods/tinker/textures/blocks/ore_aluminum_gravel.png differ diff --git a/mods/tinker/textures/blocks/ore_cobalt_gravel.png b/mods/tinker/textures/blocks/ore_cobalt_gravel.png index 129aeeae..f3054b75 100644 Binary files a/mods/tinker/textures/blocks/ore_cobalt_gravel.png and b/mods/tinker/textures/blocks/ore_cobalt_gravel.png differ diff --git a/mods/tinker/textures/blocks/ore_copper_gravel.png b/mods/tinker/textures/blocks/ore_copper_gravel.png index 44658fb7..ccc20ef8 100644 Binary files a/mods/tinker/textures/blocks/ore_copper_gravel.png and b/mods/tinker/textures/blocks/ore_copper_gravel.png differ diff --git a/mods/tinker/textures/blocks/ore_gold_gravel.png b/mods/tinker/textures/blocks/ore_gold_gravel.png index 84e8ee45..dc3e1e4e 100644 Binary files a/mods/tinker/textures/blocks/ore_gold_gravel.png and b/mods/tinker/textures/blocks/ore_gold_gravel.png differ diff --git a/mods/tinker/textures/blocks/ore_iron_gravel.png b/mods/tinker/textures/blocks/ore_iron_gravel.png index 73279de0..23d1b55a 100644 Binary files a/mods/tinker/textures/blocks/ore_iron_gravel.png and b/mods/tinker/textures/blocks/ore_iron_gravel.png differ diff --git a/mods/tinker/textures/blocks/ore_slag.png b/mods/tinker/textures/blocks/ore_slag.png index cc339648..fb95107c 100644 Binary files a/mods/tinker/textures/blocks/ore_slag.png and b/mods/tinker/textures/blocks/ore_slag.png differ diff --git a/mods/tinker/textures/blocks/ore_tin_gravel.png b/mods/tinker/textures/blocks/ore_tin_gravel.png index 3e1b312b..36bd6443 100644 Binary files a/mods/tinker/textures/blocks/ore_tin_gravel.png and b/mods/tinker/textures/blocks/ore_tin_gravel.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_birch_side.png b/mods/tinker/textures/blocks/partbuilder_birch_side.png index a9d1a495..340aa8b6 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_birch_side.png and b/mods/tinker/textures/blocks/partbuilder_birch_side.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_birch_top.png b/mods/tinker/textures/blocks/partbuilder_birch_top.png index 5469402f..ad427648 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_birch_top.png and b/mods/tinker/textures/blocks/partbuilder_birch_top.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_jungle_side.png b/mods/tinker/textures/blocks/partbuilder_jungle_side.png index 7c581780..7f4f6cda 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_jungle_side.png and b/mods/tinker/textures/blocks/partbuilder_jungle_side.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_jungle_top.png b/mods/tinker/textures/blocks/partbuilder_jungle_top.png index 5469402f..ad427648 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_jungle_top.png and b/mods/tinker/textures/blocks/partbuilder_jungle_top.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_oak_top.png b/mods/tinker/textures/blocks/partbuilder_oak_top.png index 5469402f..ad427648 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_oak_top.png and b/mods/tinker/textures/blocks/partbuilder_oak_top.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_spruce_bottom.png b/mods/tinker/textures/blocks/partbuilder_spruce_bottom.png index dc1aa2f0..77a22a41 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_spruce_bottom.png and b/mods/tinker/textures/blocks/partbuilder_spruce_bottom.png differ diff --git a/mods/tinker/textures/blocks/partbuilder_spruce_top.png b/mods/tinker/textures/blocks/partbuilder_spruce_top.png index 5469402f..ad427648 100644 Binary files a/mods/tinker/textures/blocks/partbuilder_spruce_top.png and b/mods/tinker/textures/blocks/partbuilder_spruce_top.png differ diff --git a/mods/tinker/textures/blocks/patternchest_bottom.png b/mods/tinker/textures/blocks/patternchest_bottom.png index b40ad65c..660bae6c 100644 Binary files a/mods/tinker/textures/blocks/patternchest_bottom.png and b/mods/tinker/textures/blocks/patternchest_bottom.png differ diff --git a/mods/tinker/textures/blocks/patternchest_top.png b/mods/tinker/textures/blocks/patternchest_top.png index b40ad65c..660bae6c 100644 Binary files a/mods/tinker/textures/blocks/patternchest_top.png and b/mods/tinker/textures/blocks/patternchest_top.png differ diff --git a/mods/tinker/textures/blocks/pedestal.png b/mods/tinker/textures/blocks/pedestal.png index b1c1cc7b..95ce7379 100644 Binary files a/mods/tinker/textures/blocks/pedestal.png and b/mods/tinker/textures/blocks/pedestal.png differ diff --git a/mods/tinker/textures/blocks/pedestalbottom.png b/mods/tinker/textures/blocks/pedestalbottom.png index ceb0faf5..4e31e519 100644 Binary files a/mods/tinker/textures/blocks/pedestalbottom.png and b/mods/tinker/textures/blocks/pedestalbottom.png differ diff --git a/mods/tinker/textures/blocks/pedestalside.png b/mods/tinker/textures/blocks/pedestalside.png index 00e44251..d5e0b3a0 100644 Binary files a/mods/tinker/textures/blocks/pedestalside.png and b/mods/tinker/textures/blocks/pedestalside.png differ diff --git a/mods/tinker/textures/blocks/pedestaltop.png b/mods/tinker/textures/blocks/pedestaltop.png index c10428cd..f3ec6e26 100644 Binary files a/mods/tinker/textures/blocks/pedestaltop.png and b/mods/tinker/textures/blocks/pedestaltop.png differ diff --git a/mods/tinker/textures/blocks/pedestaltopp.png b/mods/tinker/textures/blocks/pedestaltopp.png index 1d9bf4e8..09713b31 100644 Binary files a/mods/tinker/textures/blocks/pedestaltopp.png and b/mods/tinker/textures/blocks/pedestaltopp.png differ diff --git a/mods/tinker/textures/blocks/pedestaltops.png b/mods/tinker/textures/blocks/pedestaltops.png index 53167eb1..f3ec6e26 100644 Binary files a/mods/tinker/textures/blocks/pedestaltops.png and b/mods/tinker/textures/blocks/pedestaltops.png differ diff --git a/mods/tinker/textures/blocks/repeaterDust_cross.png b/mods/tinker/textures/blocks/repeaterDust_cross.png index 7c4783c5..4710de33 100644 Binary files a/mods/tinker/textures/blocks/repeaterDust_cross.png and b/mods/tinker/textures/blocks/repeaterDust_cross.png differ diff --git a/mods/tinker/textures/blocks/repeaterDust_line.png b/mods/tinker/textures/blocks/repeaterDust_line.png index f79b9ee8..ea4897a4 100644 Binary files a/mods/tinker/textures/blocks/repeaterDust_line.png and b/mods/tinker/textures/blocks/repeaterDust_line.png differ diff --git a/mods/tinker/textures/blocks/slimesand.png b/mods/tinker/textures/blocks/slimesand.png index fcd77cbf..a3361e67 100644 Binary files a/mods/tinker/textures/blocks/slimesand.png and b/mods/tinker/textures/blocks/slimesand.png differ diff --git a/mods/tinker/textures/blocks/slimesandblue.png b/mods/tinker/textures/blocks/slimesandblue.png index a947b66d..1f7ecfe8 100644 Binary files a/mods/tinker/textures/blocks/slimesandblue.png and b/mods/tinker/textures/blocks/slimesandblue.png differ diff --git a/mods/tinker/textures/blocks/torch_stone.png b/mods/tinker/textures/blocks/torch_stone.png index 5c845fe1..67624ca9 100644 Binary files a/mods/tinker/textures/blocks/torch_stone.png and b/mods/tinker/textures/blocks/torch_stone.png differ diff --git a/mods/tinker/textures/entity/pullcart.png b/mods/tinker/textures/entity/pullcart.png index 29135d5c..9a159418 100644 Binary files a/mods/tinker/textures/entity/pullcart.png and b/mods/tinker/textures/entity/pullcart.png differ diff --git a/mods/tinker/textures/gui/armorextended.png b/mods/tinker/textures/gui/armorextended.png index 850b4479..89f379e6 100644 Binary files a/mods/tinker/textures/gui/armorextended.png and b/mods/tinker/textures/gui/armorextended.png differ diff --git a/mods/tinker/textures/gui/backpack.png b/mods/tinker/textures/gui/backpack.png index 0a6f3a6e..5948050f 100644 Binary files a/mods/tinker/textures/gui/backpack.png and b/mods/tinker/textures/gui/backpack.png differ diff --git a/mods/tinker/textures/gui/book.png b/mods/tinker/textures/gui/book.png index e1457b81..c9007bda 100644 Binary files a/mods/tinker/textures/gui/book.png and b/mods/tinker/textures/gui/book.png differ diff --git a/mods/tinker/textures/gui/bookcrafting.png b/mods/tinker/textures/gui/bookcrafting.png index dad3239a..e9ee759f 100644 Binary files a/mods/tinker/textures/gui/bookcrafting.png and b/mods/tinker/textures/gui/bookcrafting.png differ diff --git a/mods/tinker/textures/gui/bookfurnace.png b/mods/tinker/textures/gui/bookfurnace.png index 9356944c..cda94fb0 100644 Binary files a/mods/tinker/textures/gui/bookfurnace.png and b/mods/tinker/textures/gui/bookfurnace.png differ diff --git a/mods/tinker/textures/gui/bookleft.png b/mods/tinker/textures/gui/bookleft.png index 8a0b0f0b..08b462df 100644 Binary files a/mods/tinker/textures/gui/bookleft.png and b/mods/tinker/textures/gui/bookleft.png differ diff --git a/mods/tinker/textures/gui/bookmodify.png b/mods/tinker/textures/gui/bookmodify.png index 8bdaab7a..7583f020 100644 Binary files a/mods/tinker/textures/gui/bookmodify.png and b/mods/tinker/textures/gui/bookmodify.png differ diff --git a/mods/tinker/textures/gui/bookright.png b/mods/tinker/textures/gui/bookright.png index 599f17bc..8c255a77 100644 Binary files a/mods/tinker/textures/gui/bookright.png and b/mods/tinker/textures/gui/bookright.png differ diff --git a/mods/tinker/textures/gui/description.png b/mods/tinker/textures/gui/description.png index 81f654af..54710ebe 100644 Binary files a/mods/tinker/textures/gui/description.png and b/mods/tinker/textures/gui/description.png differ diff --git a/mods/tinker/textures/gui/display.png b/mods/tinker/textures/gui/display.png index e4d1ceab..9a4c30d0 100644 Binary files a/mods/tinker/textures/gui/display.png and b/mods/tinker/textures/gui/display.png differ diff --git a/mods/tinker/textures/gui/frypan.png b/mods/tinker/textures/gui/frypan.png index 3e214b1b..4bd60925 100644 Binary files a/mods/tinker/textures/gui/frypan.png and b/mods/tinker/textures/gui/frypan.png differ diff --git a/mods/tinker/textures/gui/icons.png b/mods/tinker/textures/gui/icons.png index 0f1cd58b..17536d72 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/gui/newhearts.png b/mods/tinker/textures/gui/newhearts.png index 32a878c5..1f5d7b36 100644 Binary files a/mods/tinker/textures/gui/newhearts.png and b/mods/tinker/textures/gui/newhearts.png differ diff --git a/mods/tinker/textures/gui/patternchest.png b/mods/tinker/textures/gui/patternchest.png index 1d00a1e4..ef90108a 100644 Binary files a/mods/tinker/textures/gui/patternchest.png and b/mods/tinker/textures/gui/patternchest.png differ diff --git a/mods/tinker/textures/gui/patternchestmini.png b/mods/tinker/textures/gui/patternchestmini.png index 864dc5cc..40619689 100644 Binary files a/mods/tinker/textures/gui/patternchestmini.png and b/mods/tinker/textures/gui/patternchestmini.png differ diff --git a/mods/tinker/textures/gui/patternshaper.png b/mods/tinker/textures/gui/patternshaper.png index 74cfbc40..a7b344d7 100644 Binary files a/mods/tinker/textures/gui/patternshaper.png and b/mods/tinker/textures/gui/patternshaper.png differ diff --git a/mods/tinker/textures/gui/smeltery.png b/mods/tinker/textures/gui/smeltery.png index 7ee7cc8b..a4bf4b71 100644 Binary files a/mods/tinker/textures/gui/smeltery.png and b/mods/tinker/textures/gui/smeltery.png differ diff --git a/mods/tinker/textures/gui/smelteryside.png b/mods/tinker/textures/gui/smelteryside.png index 1cfcc523..7516db38 100644 Binary files a/mods/tinker/textures/gui/smelteryside.png and b/mods/tinker/textures/gui/smelteryside.png differ diff --git a/mods/tinker/textures/gui/toolparts.png b/mods/tinker/textures/gui/toolparts.png index 5aa1954b..5a113758 100644 Binary files a/mods/tinker/textures/gui/toolparts.png and b/mods/tinker/textures/gui/toolparts.png differ diff --git a/mods/tinker/textures/gui/toolstation.png b/mods/tinker/textures/gui/toolstation.png index 30fa118b..6496a224 100644 Binary files a/mods/tinker/textures/gui/toolstation.png and b/mods/tinker/textures/gui/toolstation.png differ diff --git a/mods/tinker/textures/items/apple_diamond.png b/mods/tinker/textures/items/apple_diamond.png index afb2112a..a8de5b5b 100644 Binary files a/mods/tinker/textures/items/apple_diamond.png and b/mods/tinker/textures/items/apple_diamond.png differ diff --git a/mods/tinker/textures/items/armor/dirthand.png b/mods/tinker/textures/items/armor/dirthand.png index ed069069..331ab563 100644 Binary files a/mods/tinker/textures/items/armor/dirthand.png and b/mods/tinker/textures/items/armor/dirthand.png differ diff --git a/mods/tinker/textures/items/armor/wood_boots.png b/mods/tinker/textures/items/armor/wood_boots.png index ecea7e64..f58e28ab 100644 Binary files a/mods/tinker/textures/items/armor/wood_boots.png and b/mods/tinker/textures/items/armor/wood_boots.png differ diff --git a/mods/tinker/textures/items/armor/wood_chestplate.png b/mods/tinker/textures/items/armor/wood_chestplate.png index 14687418..0c735d55 100644 Binary files a/mods/tinker/textures/items/armor/wood_chestplate.png and b/mods/tinker/textures/items/armor/wood_chestplate.png differ diff --git a/mods/tinker/textures/items/armor/wood_helmet.png b/mods/tinker/textures/items/armor/wood_helmet.png index 40279be9..d41ed11e 100644 Binary files a/mods/tinker/textures/items/armor/wood_helmet.png and b/mods/tinker/textures/items/armor/wood_helmet.png differ diff --git a/mods/tinker/textures/items/armor/wood_pants.png b/mods/tinker/textures/items/armor/wood_pants.png index 20b98c9b..39e3796f 100644 Binary files a/mods/tinker/textures/items/armor/wood_pants.png and b/mods/tinker/textures/items/armor/wood_pants.png differ diff --git a/mods/tinker/textures/items/axe/alumite_axe_handle.png b/mods/tinker/textures/items/axe/alumite_axe_handle.png index 72008c74..983ea25e 100644 Binary files a/mods/tinker/textures/items/axe/alumite_axe_handle.png and b/mods/tinker/textures/items/axe/alumite_axe_handle.png differ diff --git a/mods/tinker/textures/items/axe/alumite_axe_head.png b/mods/tinker/textures/items/axe/alumite_axe_head.png index 0273b0a4..5b820e24 100644 Binary files a/mods/tinker/textures/items/axe/alumite_axe_head.png and b/mods/tinker/textures/items/axe/alumite_axe_head.png differ diff --git a/mods/tinker/textures/items/axe/alumite_axe_head_broken.png b/mods/tinker/textures/items/axe/alumite_axe_head_broken.png index accafeb7..4f5f1b56 100644 Binary files a/mods/tinker/textures/items/axe/alumite_axe_head_broken.png and b/mods/tinker/textures/items/axe/alumite_axe_head_broken.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_handle.png b/mods/tinker/textures/items/axe/blueslime_axe_handle.png index ff66e657..08d88614 100644 Binary files a/mods/tinker/textures/items/axe/blueslime_axe_handle.png and b/mods/tinker/textures/items/axe/blueslime_axe_handle.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_head.png b/mods/tinker/textures/items/axe/blueslime_axe_head.png index 2b09f639..cbb23256 100644 Binary files a/mods/tinker/textures/items/axe/blueslime_axe_head.png and b/mods/tinker/textures/items/axe/blueslime_axe_head.png differ diff --git a/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png b/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png index d7251878..d4455630 100644 Binary files a/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png and b/mods/tinker/textures/items/axe/blueslime_axe_head_broken.png differ diff --git a/mods/tinker/textures/items/axe/emerald_axe_effect.png b/mods/tinker/textures/items/axe/emerald_axe_effect.png index 089f7008..1c6927a3 100644 Binary files a/mods/tinker/textures/items/axe/emerald_axe_effect.png and b/mods/tinker/textures/items/axe/emerald_axe_effect.png differ diff --git a/mods/tinker/textures/items/axe/silk_axe_effect.png b/mods/tinker/textures/items/axe/silk_axe_effect.png index 22ffb7db..549f78e5 100644 Binary files a/mods/tinker/textures/items/axe/silk_axe_effect.png and b/mods/tinker/textures/items/axe/silk_axe_effect.png differ diff --git a/mods/tinker/textures/items/axe/steel_axe_handle.png b/mods/tinker/textures/items/axe/steel_axe_handle.png index 47992dc5..348e9c2c 100644 Binary files a/mods/tinker/textures/items/axe/steel_axe_handle.png and b/mods/tinker/textures/items/axe/steel_axe_handle.png differ diff --git a/mods/tinker/textures/items/axe/steel_axe_head.png b/mods/tinker/textures/items/axe/steel_axe_head.png index d4c0279e..9986f939 100644 Binary files a/mods/tinker/textures/items/axe/steel_axe_head.png and b/mods/tinker/textures/items/axe/steel_axe_head.png differ diff --git a/mods/tinker/textures/items/axe/steel_axe_head_broken.png b/mods/tinker/textures/items/axe/steel_axe_head_broken.png index 501b1e69..dd54182b 100644 Binary files a/mods/tinker/textures/items/axe/steel_axe_head_broken.png and b/mods/tinker/textures/items/axe/steel_axe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_back.png new file mode 100644 index 00000000..00bc7077 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_backhead.png new file mode 100644 index 00000000..c3cfcade Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_binding.png new file mode 100644 index 00000000..00bc7077 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_front.png new file mode 100644 index 00000000..a4fafb83 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead.png new file mode 100644 index 00000000..a4fafb83 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..7eab7704 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_handle.png new file mode 100644 index 00000000..c0653a95 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head.png new file mode 100644 index 00000000..c3cfcade Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head_broken.png new file mode 100644 index 00000000..7eab7704 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/alumite_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_back.png new file mode 100644 index 00000000..e17e676c Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_backhead.png new file mode 100644 index 00000000..dc8c9454 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_binding.png new file mode 100644 index 00000000..e17e676c Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_front.png new file mode 100644 index 00000000..d5612ed4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead.png new file mode 100644 index 00000000..d5612ed4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..fc683235 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_handle.png new file mode 100644 index 00000000..04e117ce Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head.png new file mode 100644 index 00000000..dc8c9454 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head_broken.png new file mode 100644 index 00000000..fc683235 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ardite_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/blaze_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/blaze_battleaxe_effect.png new file mode 100644 index 00000000..c8658a70 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blaze_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_back.png new file mode 100644 index 00000000..77942b2a Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_backhead.png new file mode 100644 index 00000000..58f85e77 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_binding.png new file mode 100644 index 00000000..77942b2a Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_front.png new file mode 100644 index 00000000..097d1bc4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead.png new file mode 100644 index 00000000..097d1bc4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..bb14d099 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_handle.png new file mode 100644 index 00000000..59ccda9e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head.png new file mode 100644 index 00000000..58f85e77 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head_broken.png new file mode 100644 index 00000000..bb14d099 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/blueslime_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_back.png new file mode 100644 index 00000000..5b96d4d5 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_backhead.png new file mode 100644 index 00000000..7651d115 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_binding.png new file mode 100644 index 00000000..5b96d4d5 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_front.png new file mode 100644 index 00000000..f9eb4655 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead.png new file mode 100644 index 00000000..f9eb4655 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..267506b9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_handle.png new file mode 100644 index 00000000..b0cf08f4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_head.png new file mode 100644 index 00000000..7651d115 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/bone_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/bone_battleaxe_head_broken.png new file mode 100644 index 00000000..267506b9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bone_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_back.png new file mode 100644 index 00000000..6d52992a Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_backhead.png new file mode 100644 index 00000000..64aa4e79 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_binding.png new file mode 100644 index 00000000..6d52992a Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_front.png new file mode 100644 index 00000000..68d34df4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead.png new file mode 100644 index 00000000..68d34df4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..66c62c44 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_handle.png new file mode 100644 index 00000000..b5f5345f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head.png new file mode 100644 index 00000000..64aa4e79 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head_broken.png new file mode 100644 index 00000000..66c62c44 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/bronze_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_back.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_backhead.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_binding.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_front.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_handle.png new file mode 100644 index 00000000..87307a59 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cactus_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_back.png new file mode 100644 index 00000000..c02a088d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_backhead.png new file mode 100644 index 00000000..f009591f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_binding.png new file mode 100644 index 00000000..c02a088d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_front.png new file mode 100644 index 00000000..662c8b09 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead.png new file mode 100644 index 00000000..662c8b09 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..ddcbd60d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_handle.png new file mode 100644 index 00000000..2efa71a3 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head.png new file mode 100644 index 00000000..f009591f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head_broken.png new file mode 100644 index 00000000..ddcbd60d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/cobalt_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_back.png new file mode 100644 index 00000000..b2f796d6 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_backhead.png new file mode 100644 index 00000000..4dedbccb Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_binding.png new file mode 100644 index 00000000..b2f796d6 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_front.png new file mode 100644 index 00000000..aceabdd7 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead.png new file mode 100644 index 00000000..aceabdd7 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..7b286bec Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_handle.png new file mode 100644 index 00000000..5af036b8 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_head.png new file mode 100644 index 00000000..4dedbccb Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/copper_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/copper_battleaxe_head_broken.png new file mode 100644 index 00000000..7b286bec Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/copper_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/diamond_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/diamond_battleaxe_effect.png new file mode 100644 index 00000000..2b40288e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/diamond_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/electric_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/electric_battleaxe_effect.png new file mode 100644 index 00000000..2a7854b2 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/electric_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/emerald_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/emerald_battleaxe_effect.png new file mode 100644 index 00000000..000ac5e9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/emerald_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_back.png new file mode 100644 index 00000000..6e022f1d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_backhead.png new file mode 100644 index 00000000..02fecb09 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_binding.png new file mode 100644 index 00000000..6e022f1d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_front.png new file mode 100644 index 00000000..d5804d35 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead.png new file mode 100644 index 00000000..d5804d35 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..97068737 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_handle.png new file mode 100644 index 00000000..f288d4e2 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_head.png new file mode 100644 index 00000000..02fecb09 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/flint_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/flint_battleaxe_head_broken.png new file mode 100644 index 00000000..97068737 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/flint_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/ice_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/ice_battleaxe_effect.png new file mode 100644 index 00000000..dae3ecac Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/ice_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_back.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_backhead.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_binding.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_front.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_handle.png new file mode 100644 index 00000000..6d2aab8f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_head.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/iron_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/iron_battleaxe_head_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/iron_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/lapis_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/lapis_battleaxe_effect.png new file mode 100644 index 00000000..6d36c579 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/lapis_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/lava_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/lava_battleaxe_effect.png new file mode 100644 index 00000000..b19b3244 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/lava_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_back.png new file mode 100644 index 00000000..bf786f27 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_backhead.png new file mode 100644 index 00000000..d891905e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_binding.png new file mode 100644 index 00000000..bf786f27 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_front.png new file mode 100644 index 00000000..b8b2966b Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead.png new file mode 100644 index 00000000..b8b2966b Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..376378b0 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_handle.png new file mode 100644 index 00000000..3d34adee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head.png new file mode 100644 index 00000000..d891905e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head_broken.png new file mode 100644 index 00000000..376378b0 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/manyullyn_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/moss_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/moss_battleaxe_effect.png new file mode 100644 index 00000000..b20e3d12 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/moss_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/necrotic_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/necrotic_battleaxe_effect.png new file mode 100644 index 00000000..5c910e64 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/necrotic_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_back.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_backhead.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_binding.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_front.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_handle.png new file mode 100644 index 00000000..2ef67d99 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/netherrack_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_back.png new file mode 100644 index 00000000..89b8847f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_backhead.png new file mode 100644 index 00000000..5654ff1f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_binding.png new file mode 100644 index 00000000..89b8847f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_front.png new file mode 100644 index 00000000..1ac7d82c Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead.png new file mode 100644 index 00000000..1ac7d82c Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..322adb99 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_handle.png new file mode 100644 index 00000000..4f77b885 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head.png new file mode 100644 index 00000000..5654ff1f Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head_broken.png new file mode 100644 index 00000000..322adb99 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/obsidian_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_back.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_backhead.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_binding.png new file mode 100644 index 00000000..beab2f46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_front.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead.png new file mode 100644 index 00000000..c7895997 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_handle.png new file mode 100644 index 00000000..19d341dd Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_head.png new file mode 100644 index 00000000..bec4e589 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/paper_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/paper_battleaxe_head_broken.png new file mode 100644 index 00000000..ce66d9ee Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/paper_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/quartz_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/quartz_battleaxe_effect.png new file mode 100644 index 00000000..5aff1410 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/quartz_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/redstone_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/redstone_battleaxe_effect.png new file mode 100644 index 00000000..be01d2c8 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/redstone_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/silk_battleaxe_effect.png b/mods/tinker/textures/items/battleaxe/silk_battleaxe_effect.png new file mode 100644 index 00000000..484e5919 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/silk_battleaxe_effect.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_back.png new file mode 100644 index 00000000..6eb6712e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_backhead.png new file mode 100644 index 00000000..b0e7cc46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_binding.png new file mode 100644 index 00000000..6eb6712e Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_front.png new file mode 100644 index 00000000..94345a46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead.png new file mode 100644 index 00000000..94345a46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..4ce210d1 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_handle.png new file mode 100644 index 00000000..870ef2fb Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_head.png new file mode 100644 index 00000000..b0e7cc46 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/slime_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/slime_battleaxe_head_broken.png new file mode 100644 index 00000000..4ce210d1 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/slime_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_back.png new file mode 100644 index 00000000..0ce7ecd9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_backhead.png new file mode 100644 index 00000000..138b06f1 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_binding.png new file mode 100644 index 00000000..0ce7ecd9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_front.png new file mode 100644 index 00000000..c4ffd2ec Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead.png new file mode 100644 index 00000000..c4ffd2ec Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..3b488ead Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_handle.png new file mode 100644 index 00000000..19f826af Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_head.png new file mode 100644 index 00000000..138b06f1 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/steel_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/steel_battleaxe_head_broken.png new file mode 100644 index 00000000..3b488ead Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/steel_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_back.png new file mode 100644 index 00000000..bbfd4bf9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_backhead.png new file mode 100644 index 00000000..88c6af68 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_binding.png new file mode 100644 index 00000000..bbfd4bf9 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_front.png new file mode 100644 index 00000000..9760aff5 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead.png new file mode 100644 index 00000000..9760aff5 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..72e6b964 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_handle.png new file mode 100644 index 00000000..cb95548d Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_head.png new file mode 100644 index 00000000..88c6af68 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/stone_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/stone_battleaxe_head_broken.png new file mode 100644 index 00000000..72e6b964 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/stone_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_back.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_back.png new file mode 100644 index 00000000..8ad630a4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_back.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_backhead.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_backhead.png new file mode 100644 index 00000000..5e41b3e2 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_backhead.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_binding.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_binding.png new file mode 100644 index 00000000..8ad630a4 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_binding.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_front.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_front.png new file mode 100644 index 00000000..ca1ea8ce Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_front.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead.png new file mode 100644 index 00000000..ca1ea8ce Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead_broken.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead_broken.png new file mode 100644 index 00000000..e1664ae3 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_fronthead_broken.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_handle.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_handle.png new file mode 100644 index 00000000..3e158389 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_handle.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_head.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_head.png new file mode 100644 index 00000000..5e41b3e2 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_head.png differ diff --git a/mods/tinker/textures/items/battleaxe/wood_battleaxe_head_broken.png b/mods/tinker/textures/items/battleaxe/wood_battleaxe_head_broken.png new file mode 100644 index 00000000..e1664ae3 Binary files /dev/null and b/mods/tinker/textures/items/battleaxe/wood_battleaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png index dc4b30d2..8b43760b 100644 Binary files a/mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png and b/mods/tinker/textures/items/battlesign/alumite_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/battlesign/alumite_battlesign_head.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_head.png index 02ea366c..1380200f 100644 Binary files a/mods/tinker/textures/items/battlesign/alumite_battlesign_head.png and b/mods/tinker/textures/items/battlesign/alumite_battlesign_head.png differ diff --git a/mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png index df8e3a01..1f120508 100644 Binary files a/mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png and b/mods/tinker/textures/items/battlesign/alumite_battlesign_head_broken.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png index 6b24f2fe..12bb9975 100644 Binary files a/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png index c6477ad7..945e6076 100644 Binary files a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head.png differ diff --git a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png index f74b2086..9a3d45e2 100644 Binary files a/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png and b/mods/tinker/textures/items/battlesign/blueslime_battlesign_head_broken.png differ diff --git a/mods/tinker/textures/items/battlesign/quartz_battlesign_effect.png b/mods/tinker/textures/items/battlesign/quartz_battlesign_effect.png index 066df53b..d34c9dc9 100644 Binary files a/mods/tinker/textures/items/battlesign/quartz_battlesign_effect.png and b/mods/tinker/textures/items/battlesign/quartz_battlesign_effect.png differ diff --git a/mods/tinker/textures/items/battlesign/silk_battlesign_effect.png b/mods/tinker/textures/items/battlesign/silk_battlesign_effect.png index 33658a16..e5c5ef03 100644 Binary files a/mods/tinker/textures/items/battlesign/silk_battlesign_effect.png and b/mods/tinker/textures/items/battlesign/silk_battlesign_effect.png differ diff --git a/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png b/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png index 991ef860..5fae9af9 100644 Binary files a/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png and b/mods/tinker/textures/items/battlesign/slime_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/battlesign/steel_battlesign_handle.png b/mods/tinker/textures/items/battlesign/steel_battlesign_handle.png index 24358274..2632cbdb 100644 Binary files a/mods/tinker/textures/items/battlesign/steel_battlesign_handle.png and b/mods/tinker/textures/items/battlesign/steel_battlesign_handle.png differ diff --git a/mods/tinker/textures/items/battlesign/steel_battlesign_head.png b/mods/tinker/textures/items/battlesign/steel_battlesign_head.png index 1a51a552..3ff8770a 100644 Binary files a/mods/tinker/textures/items/battlesign/steel_battlesign_head.png and b/mods/tinker/textures/items/battlesign/steel_battlesign_head.png differ diff --git a/mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png b/mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png index fc0b1ab3..d4997205 100644 Binary files a/mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png and b/mods/tinker/textures/items/battlesign/steel_battlesign_head_broken.png differ diff --git a/mods/tinker/textures/items/blankface.png b/mods/tinker/textures/items/blankface.png index 4f53a614..702fe585 100644 Binary files a/mods/tinker/textures/items/blankface.png and b/mods/tinker/textures/items/blankface.png differ diff --git a/mods/tinker/textures/items/blanksprite.png b/mods/tinker/textures/items/blanksprite.png index 888c7ea3..827bd32d 100644 Binary files a/mods/tinker/textures/items/blanksprite.png and b/mods/tinker/textures/items/blanksprite.png differ diff --git a/mods/tinker/textures/items/broadsword/alumite_sword_accessory.png b/mods/tinker/textures/items/broadsword/alumite_sword_accessory.png index 207946e9..44fc42f7 100644 Binary files a/mods/tinker/textures/items/broadsword/alumite_sword_accessory.png and b/mods/tinker/textures/items/broadsword/alumite_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/alumite_sword_blade.png b/mods/tinker/textures/items/broadsword/alumite_sword_blade.png index 6f8e8da1..f78c3bb1 100644 Binary files a/mods/tinker/textures/items/broadsword/alumite_sword_blade.png and b/mods/tinker/textures/items/broadsword/alumite_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png index ab500e05..3e1fdc8f 100644 Binary files a/mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/alumite_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/alumite_sword_handle.png b/mods/tinker/textures/items/broadsword/alumite_sword_handle.png index b2290eb2..30efa5c4 100644 Binary files a/mods/tinker/textures/items/broadsword/alumite_sword_handle.png and b/mods/tinker/textures/items/broadsword/alumite_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/ardite_sword_accessory.png b/mods/tinker/textures/items/broadsword/ardite_sword_accessory.png index 335ce4c9..0e3fb93d 100644 Binary files a/mods/tinker/textures/items/broadsword/ardite_sword_accessory.png and b/mods/tinker/textures/items/broadsword/ardite_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/ardite_sword_blade.png b/mods/tinker/textures/items/broadsword/ardite_sword_blade.png index 58435398..7d5b5902 100644 Binary files a/mods/tinker/textures/items/broadsword/ardite_sword_blade.png and b/mods/tinker/textures/items/broadsword/ardite_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png index 5ef32d31..73ae19ca 100644 Binary files a/mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/ardite_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/ardite_sword_handle.png b/mods/tinker/textures/items/broadsword/ardite_sword_handle.png index fdcea399..cf2525a5 100644 Binary files a/mods/tinker/textures/items/broadsword/ardite_sword_handle.png and b/mods/tinker/textures/items/broadsword/ardite_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/blaze_sword_effect.png b/mods/tinker/textures/items/broadsword/blaze_sword_effect.png index 2b84e52e..96eb2df4 100644 Binary files a/mods/tinker/textures/items/broadsword/blaze_sword_effect.png and b/mods/tinker/textures/items/broadsword/blaze_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png b/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png index 7330fbc7..2d2d6fa3 100644 Binary files a/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png and b/mods/tinker/textures/items/broadsword/blueslime_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png b/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png index 6cd3a1b0..b1e0908f 100644 Binary files a/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png and b/mods/tinker/textures/items/broadsword/blueslime_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png index e9988b49..53a40045 100644 Binary files a/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/blueslime_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png b/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png index ce2adddd..dad9051f 100644 Binary files a/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png and b/mods/tinker/textures/items/broadsword/blueslime_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/bone_sword_accessory.png b/mods/tinker/textures/items/broadsword/bone_sword_accessory.png index 5b27bd2a..9f69bacc 100644 Binary files a/mods/tinker/textures/items/broadsword/bone_sword_accessory.png and b/mods/tinker/textures/items/broadsword/bone_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/bone_sword_blade.png b/mods/tinker/textures/items/broadsword/bone_sword_blade.png index 52b9c573..b55fa44f 100644 Binary files a/mods/tinker/textures/items/broadsword/bone_sword_blade.png and b/mods/tinker/textures/items/broadsword/bone_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png index e325d9ec..67dd6c9c 100644 Binary files a/mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/bone_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/bone_sword_handle.png b/mods/tinker/textures/items/broadsword/bone_sword_handle.png index 0e04e2c7..1c8efb96 100644 Binary files a/mods/tinker/textures/items/broadsword/bone_sword_handle.png and b/mods/tinker/textures/items/broadsword/bone_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/bronze_sword_accessory.png b/mods/tinker/textures/items/broadsword/bronze_sword_accessory.png index fa6ce5c1..dd7965df 100644 Binary files a/mods/tinker/textures/items/broadsword/bronze_sword_accessory.png and b/mods/tinker/textures/items/broadsword/bronze_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/bronze_sword_blade.png b/mods/tinker/textures/items/broadsword/bronze_sword_blade.png index 465792ea..2f36688c 100644 Binary files a/mods/tinker/textures/items/broadsword/bronze_sword_blade.png and b/mods/tinker/textures/items/broadsword/bronze_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png index 76032001..a5648245 100644 Binary files a/mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/bronze_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/bronze_sword_handle.png b/mods/tinker/textures/items/broadsword/bronze_sword_handle.png index 58e8e967..69ec7b18 100644 Binary files a/mods/tinker/textures/items/broadsword/bronze_sword_handle.png and b/mods/tinker/textures/items/broadsword/bronze_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/cactus_sword_accessory.png b/mods/tinker/textures/items/broadsword/cactus_sword_accessory.png index 4f18937e..c5f4fab8 100644 Binary files a/mods/tinker/textures/items/broadsword/cactus_sword_accessory.png and b/mods/tinker/textures/items/broadsword/cactus_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/cactus_sword_blade.png b/mods/tinker/textures/items/broadsword/cactus_sword_blade.png index 7ec563be..182df7cc 100644 Binary files a/mods/tinker/textures/items/broadsword/cactus_sword_blade.png and b/mods/tinker/textures/items/broadsword/cactus_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png index 9133613a..4c3bcdb4 100644 Binary files a/mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/cactus_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/cactus_sword_handle.png b/mods/tinker/textures/items/broadsword/cactus_sword_handle.png index f43b229b..2dea020d 100644 Binary files a/mods/tinker/textures/items/broadsword/cactus_sword_handle.png and b/mods/tinker/textures/items/broadsword/cactus_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png b/mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png index e72af18e..5dbe741d 100644 Binary files a/mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png and b/mods/tinker/textures/items/broadsword/cobalt_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/cobalt_sword_blade.png b/mods/tinker/textures/items/broadsword/cobalt_sword_blade.png index db04cffd..37e239db 100644 Binary files a/mods/tinker/textures/items/broadsword/cobalt_sword_blade.png and b/mods/tinker/textures/items/broadsword/cobalt_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png index 0cdeb93f..be12951b 100644 Binary files a/mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/cobalt_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/cobalt_sword_handle.png b/mods/tinker/textures/items/broadsword/cobalt_sword_handle.png index 16e1834c..98d508f7 100644 Binary files a/mods/tinker/textures/items/broadsword/cobalt_sword_handle.png and b/mods/tinker/textures/items/broadsword/cobalt_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/copper_sword_accessory.png b/mods/tinker/textures/items/broadsword/copper_sword_accessory.png index 50bc526e..63ca604b 100644 Binary files a/mods/tinker/textures/items/broadsword/copper_sword_accessory.png and b/mods/tinker/textures/items/broadsword/copper_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/copper_sword_blade.png b/mods/tinker/textures/items/broadsword/copper_sword_blade.png index 514a0a34..4e91728c 100644 Binary files a/mods/tinker/textures/items/broadsword/copper_sword_blade.png and b/mods/tinker/textures/items/broadsword/copper_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png index aae09af0..85b560e1 100644 Binary files a/mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/copper_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/copper_sword_handle.png b/mods/tinker/textures/items/broadsword/copper_sword_handle.png index 674dd529..05251f72 100644 Binary files a/mods/tinker/textures/items/broadsword/copper_sword_handle.png and b/mods/tinker/textures/items/broadsword/copper_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/diamond_sword_effect.png b/mods/tinker/textures/items/broadsword/diamond_sword_effect.png index 28822dfd..774736b7 100644 Binary files a/mods/tinker/textures/items/broadsword/diamond_sword_effect.png and b/mods/tinker/textures/items/broadsword/diamond_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/electric_sword_effect.png b/mods/tinker/textures/items/broadsword/electric_sword_effect.png index 33267cbe..c0d2dd8e 100644 Binary files a/mods/tinker/textures/items/broadsword/electric_sword_effect.png and b/mods/tinker/textures/items/broadsword/electric_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/emerald_sword_effect.png b/mods/tinker/textures/items/broadsword/emerald_sword_effect.png index 901f8f79..7716dde9 100644 Binary files a/mods/tinker/textures/items/broadsword/emerald_sword_effect.png and b/mods/tinker/textures/items/broadsword/emerald_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/flint_sword_accessory.png b/mods/tinker/textures/items/broadsword/flint_sword_accessory.png index 378a6d28..2b97ec3e 100644 Binary files a/mods/tinker/textures/items/broadsword/flint_sword_accessory.png and b/mods/tinker/textures/items/broadsword/flint_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/flint_sword_blade.png b/mods/tinker/textures/items/broadsword/flint_sword_blade.png index d7a079d5..77aa0469 100644 Binary files a/mods/tinker/textures/items/broadsword/flint_sword_blade.png and b/mods/tinker/textures/items/broadsword/flint_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png index 59524192..9aee6cfe 100644 Binary files a/mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/flint_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/flint_sword_handle.png b/mods/tinker/textures/items/broadsword/flint_sword_handle.png index f0e650d2..30265426 100644 Binary files a/mods/tinker/textures/items/broadsword/flint_sword_handle.png and b/mods/tinker/textures/items/broadsword/flint_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/glowstone_sword_effect.png b/mods/tinker/textures/items/broadsword/glowstone_sword_effect.png deleted file mode 100644 index 13fc6e09..00000000 Binary files a/mods/tinker/textures/items/broadsword/glowstone_sword_effect.png and /dev/null differ diff --git a/mods/tinker/textures/items/broadsword/ice_sword_effect.png b/mods/tinker/textures/items/broadsword/ice_sword_effect.png index 7e94bfa3..fec76f2c 100644 Binary files a/mods/tinker/textures/items/broadsword/ice_sword_effect.png and b/mods/tinker/textures/items/broadsword/ice_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/iron_sword_accessory.png b/mods/tinker/textures/items/broadsword/iron_sword_accessory.png index 628f33c4..499db379 100644 Binary files a/mods/tinker/textures/items/broadsword/iron_sword_accessory.png and b/mods/tinker/textures/items/broadsword/iron_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/iron_sword_blade.png b/mods/tinker/textures/items/broadsword/iron_sword_blade.png index 5d95af17..71e8d524 100644 Binary files a/mods/tinker/textures/items/broadsword/iron_sword_blade.png and b/mods/tinker/textures/items/broadsword/iron_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png index 093c976e..19fa9fc3 100644 Binary files a/mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/iron_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/iron_sword_handle.png b/mods/tinker/textures/items/broadsword/iron_sword_handle.png index 36bba9f2..b330ef24 100644 Binary files a/mods/tinker/textures/items/broadsword/iron_sword_handle.png and b/mods/tinker/textures/items/broadsword/iron_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/lapis_sword_effect.png b/mods/tinker/textures/items/broadsword/lapis_sword_effect.png index bb561b97..45610f6d 100644 Binary files a/mods/tinker/textures/items/broadsword/lapis_sword_effect.png and b/mods/tinker/textures/items/broadsword/lapis_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/lava_sword_effect.png b/mods/tinker/textures/items/broadsword/lava_sword_effect.png index d919eb71..7a6b63d5 100644 Binary files a/mods/tinker/textures/items/broadsword/lava_sword_effect.png and b/mods/tinker/textures/items/broadsword/lava_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png index a20e8ae7..fa830907 100644 Binary files a/mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png and b/mods/tinker/textures/items/broadsword/manyullyn_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png index 5fd31240..e7350e62 100644 Binary files a/mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png and b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png index 93f2f9dc..ba37c039 100644 Binary files a/mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/manyullyn_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png b/mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png index d7e3cb37..657442db 100644 Binary files a/mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png and b/mods/tinker/textures/items/broadsword/manyullyn_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/moss_sword_effect.png b/mods/tinker/textures/items/broadsword/moss_sword_effect.png index cac8cbed..42ce6463 100644 Binary files a/mods/tinker/textures/items/broadsword/moss_sword_effect.png and b/mods/tinker/textures/items/broadsword/moss_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/necrotic_sword_effect.png b/mods/tinker/textures/items/broadsword/necrotic_sword_effect.png index 9b7c69b2..ea669231 100644 Binary files a/mods/tinker/textures/items/broadsword/necrotic_sword_effect.png and b/mods/tinker/textures/items/broadsword/necrotic_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png b/mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png index ab18de9d..b1d2824b 100644 Binary files a/mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png and b/mods/tinker/textures/items/broadsword/netherrack_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/netherrack_sword_blade.png b/mods/tinker/textures/items/broadsword/netherrack_sword_blade.png index 1b4964cb..a77f5eb8 100644 Binary files a/mods/tinker/textures/items/broadsword/netherrack_sword_blade.png and b/mods/tinker/textures/items/broadsword/netherrack_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png index 1f4a3bdf..7e980a33 100644 Binary files a/mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/netherrack_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/netherrack_sword_handle.png b/mods/tinker/textures/items/broadsword/netherrack_sword_handle.png index f47198c7..be32d495 100644 Binary files a/mods/tinker/textures/items/broadsword/netherrack_sword_handle.png and b/mods/tinker/textures/items/broadsword/netherrack_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png b/mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png index b50503b3..1a7abcf5 100644 Binary files a/mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png and b/mods/tinker/textures/items/broadsword/obsidian_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/obsidian_sword_blade.png b/mods/tinker/textures/items/broadsword/obsidian_sword_blade.png index d403712c..bd540240 100644 Binary files a/mods/tinker/textures/items/broadsword/obsidian_sword_blade.png and b/mods/tinker/textures/items/broadsword/obsidian_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png index 15c772de..8b90e2a6 100644 Binary files a/mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/obsidian_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/obsidian_sword_handle.png b/mods/tinker/textures/items/broadsword/obsidian_sword_handle.png index d5be789c..0532d17b 100644 Binary files a/mods/tinker/textures/items/broadsword/obsidian_sword_handle.png and b/mods/tinker/textures/items/broadsword/obsidian_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/paper_sword_accessory.png b/mods/tinker/textures/items/broadsword/paper_sword_accessory.png index 73807276..60f26499 100644 Binary files a/mods/tinker/textures/items/broadsword/paper_sword_accessory.png and b/mods/tinker/textures/items/broadsword/paper_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/paper_sword_blade.png b/mods/tinker/textures/items/broadsword/paper_sword_blade.png index cc0bc1d3..4d6740a9 100644 Binary files a/mods/tinker/textures/items/broadsword/paper_sword_blade.png and b/mods/tinker/textures/items/broadsword/paper_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png index 728677ad..a58c300b 100644 Binary files a/mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/paper_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/paper_sword_handle.png b/mods/tinker/textures/items/broadsword/paper_sword_handle.png index 99fc5cf5..830aaf38 100644 Binary files a/mods/tinker/textures/items/broadsword/paper_sword_handle.png and b/mods/tinker/textures/items/broadsword/paper_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/quartz_sword_effect.png b/mods/tinker/textures/items/broadsword/quartz_sword_effect.png index 79ee0338..b73ccb77 100644 Binary files a/mods/tinker/textures/items/broadsword/quartz_sword_effect.png and b/mods/tinker/textures/items/broadsword/quartz_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/redstone_sword_effect.png b/mods/tinker/textures/items/broadsword/redstone_sword_effect.png deleted file mode 100644 index 422b20e6..00000000 Binary files a/mods/tinker/textures/items/broadsword/redstone_sword_effect.png and /dev/null differ diff --git a/mods/tinker/textures/items/broadsword/silk_sword_effect.png b/mods/tinker/textures/items/broadsword/silk_sword_effect.png index 774f7b3e..fa633d9d 100644 Binary files a/mods/tinker/textures/items/broadsword/silk_sword_effect.png and b/mods/tinker/textures/items/broadsword/silk_sword_effect.png differ diff --git a/mods/tinker/textures/items/broadsword/slime_sword_accessory.png b/mods/tinker/textures/items/broadsword/slime_sword_accessory.png index a8f28134..5fe7cf9c 100644 Binary files a/mods/tinker/textures/items/broadsword/slime_sword_accessory.png and b/mods/tinker/textures/items/broadsword/slime_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/slime_sword_blade.png b/mods/tinker/textures/items/broadsword/slime_sword_blade.png index ae3fe387..8b83e04f 100644 Binary files a/mods/tinker/textures/items/broadsword/slime_sword_blade.png and b/mods/tinker/textures/items/broadsword/slime_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png index 422d79b2..6c94284e 100644 Binary files a/mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/slime_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/slime_sword_handle.png b/mods/tinker/textures/items/broadsword/slime_sword_handle.png index 275809df..a3ed36a0 100644 Binary files a/mods/tinker/textures/items/broadsword/slime_sword_handle.png and b/mods/tinker/textures/items/broadsword/slime_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/steel_sword_accessory.png b/mods/tinker/textures/items/broadsword/steel_sword_accessory.png index a93ffcde..ea0fddc2 100644 Binary files a/mods/tinker/textures/items/broadsword/steel_sword_accessory.png and b/mods/tinker/textures/items/broadsword/steel_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/steel_sword_blade.png b/mods/tinker/textures/items/broadsword/steel_sword_blade.png index 624279bc..73b14771 100644 Binary files a/mods/tinker/textures/items/broadsword/steel_sword_blade.png and b/mods/tinker/textures/items/broadsword/steel_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png index 3745e435..c2930062 100644 Binary files a/mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/steel_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/steel_sword_handle.png b/mods/tinker/textures/items/broadsword/steel_sword_handle.png index cf05278f..fc416b1c 100644 Binary files a/mods/tinker/textures/items/broadsword/steel_sword_handle.png and b/mods/tinker/textures/items/broadsword/steel_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/stone_sword_accessory.png b/mods/tinker/textures/items/broadsword/stone_sword_accessory.png index 46117755..022fd718 100644 Binary files a/mods/tinker/textures/items/broadsword/stone_sword_accessory.png and b/mods/tinker/textures/items/broadsword/stone_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/stone_sword_blade.png b/mods/tinker/textures/items/broadsword/stone_sword_blade.png index da579aa1..295612fc 100644 Binary files a/mods/tinker/textures/items/broadsword/stone_sword_blade.png and b/mods/tinker/textures/items/broadsword/stone_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png index 8ac8c80b..05159a3b 100644 Binary files a/mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/stone_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/stone_sword_handle.png b/mods/tinker/textures/items/broadsword/stone_sword_handle.png index 1659297a..57402b13 100644 Binary files a/mods/tinker/textures/items/broadsword/stone_sword_handle.png and b/mods/tinker/textures/items/broadsword/stone_sword_handle.png differ diff --git a/mods/tinker/textures/items/broadsword/wood_sword_accessory.png b/mods/tinker/textures/items/broadsword/wood_sword_accessory.png index bf4ca42f..24d205b4 100644 Binary files a/mods/tinker/textures/items/broadsword/wood_sword_accessory.png and b/mods/tinker/textures/items/broadsword/wood_sword_accessory.png differ diff --git a/mods/tinker/textures/items/broadsword/wood_sword_blade.png b/mods/tinker/textures/items/broadsword/wood_sword_blade.png index c55e923c..d3fdca9a 100644 Binary files a/mods/tinker/textures/items/broadsword/wood_sword_blade.png and b/mods/tinker/textures/items/broadsword/wood_sword_blade.png differ diff --git a/mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png b/mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png index 2fa1a2df..d5fe5cd5 100644 Binary files a/mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png and b/mods/tinker/textures/items/broadsword/wood_sword_blade_broken.png differ diff --git a/mods/tinker/textures/items/broadsword/wood_sword_handle.png b/mods/tinker/textures/items/broadsword/wood_sword_handle.png index 27c0b26a..8d532e58 100644 Binary files a/mods/tinker/textures/items/broadsword/wood_sword_handle.png and b/mods/tinker/textures/items/broadsword/wood_sword_handle.png differ diff --git a/mods/tinker/textures/items/canister_empty.png b/mods/tinker/textures/items/canister_empty.png index 8160fecb..1428154a 100644 Binary files a/mods/tinker/textures/items/canister_empty.png and b/mods/tinker/textures/items/canister_empty.png differ diff --git a/mods/tinker/textures/items/canister_heart.png b/mods/tinker/textures/items/canister_heart.png index b9193829..4513ec6a 100644 Binary files a/mods/tinker/textures/items/canister_heart.png and b/mods/tinker/textures/items/canister_heart.png differ diff --git a/mods/tinker/textures/items/chisel/paper_chisel_handle.png b/mods/tinker/textures/items/chisel/paper_chisel_handle.png index eb51ad57..3b2c1b07 100644 Binary files a/mods/tinker/textures/items/chisel/paper_chisel_handle.png and b/mods/tinker/textures/items/chisel/paper_chisel_handle.png differ diff --git a/mods/tinker/textures/items/cleaver/cobalt_cleaver_shield.png b/mods/tinker/textures/items/cleaver/cobalt_cleaver_shield.png index 56f7950f..38a4ab23 100644 Binary files a/mods/tinker/textures/items/cleaver/cobalt_cleaver_shield.png and b/mods/tinker/textures/items/cleaver/cobalt_cleaver_shield.png differ diff --git a/mods/tinker/textures/items/cleaver/paper_cleaver_handle.png b/mods/tinker/textures/items/cleaver/paper_cleaver_handle.png index f3b57926..6ad54759 100644 Binary files a/mods/tinker/textures/items/cleaver/paper_cleaver_handle.png and b/mods/tinker/textures/items/cleaver/paper_cleaver_handle.png differ diff --git a/mods/tinker/textures/items/cleaver/paper_cleaver_head.png b/mods/tinker/textures/items/cleaver/paper_cleaver_head.png index 6d81a709..3b3f129f 100644 Binary files a/mods/tinker/textures/items/cleaver/paper_cleaver_head.png and b/mods/tinker/textures/items/cleaver/paper_cleaver_head.png differ diff --git a/mods/tinker/textures/items/cleaver/paper_cleaver_head_broken.png b/mods/tinker/textures/items/cleaver/paper_cleaver_head_broken.png index c3001eab..e3ee4f08 100644 Binary files a/mods/tinker/textures/items/cleaver/paper_cleaver_head_broken.png and b/mods/tinker/textures/items/cleaver/paper_cleaver_head_broken.png differ diff --git a/mods/tinker/textures/items/dagger/emerald_dagger_effect.png b/mods/tinker/textures/items/dagger/emerald_dagger_effect.png index 48f384c5..496edf53 100644 Binary files a/mods/tinker/textures/items/dagger/emerald_dagger_effect.png and b/mods/tinker/textures/items/dagger/emerald_dagger_effect.png differ diff --git a/mods/tinker/textures/items/dagger/paper_dagger_blade.png b/mods/tinker/textures/items/dagger/paper_dagger_blade.png index e14b5d5c..07be11cc 100644 Binary files a/mods/tinker/textures/items/dagger/paper_dagger_blade.png and b/mods/tinker/textures/items/dagger/paper_dagger_blade.png differ diff --git a/mods/tinker/textures/items/dagger/quartz_dagger_effect.png b/mods/tinker/textures/items/dagger/quartz_dagger_effect.png index ec2f3cef..1f2a8d2e 100644 Binary files a/mods/tinker/textures/items/dagger/quartz_dagger_effect.png and b/mods/tinker/textures/items/dagger/quartz_dagger_effect.png differ diff --git a/mods/tinker/textures/items/dagger/silk_dagger_effect.png b/mods/tinker/textures/items/dagger/silk_dagger_effect.png index 8b397581..bd6af86f 100644 Binary files a/mods/tinker/textures/items/dagger/silk_dagger_effect.png and b/mods/tinker/textures/items/dagger/silk_dagger_effect.png differ diff --git a/mods/tinker/textures/items/dagger/stone_dagger_handle.png b/mods/tinker/textures/items/dagger/stone_dagger_handle.png index 53ff56f9..10774ff7 100644 Binary files a/mods/tinker/textures/items/dagger/stone_dagger_handle.png and b/mods/tinker/textures/items/dagger/stone_dagger_handle.png differ diff --git a/mods/tinker/textures/items/edibleslime.png b/mods/tinker/textures/items/edibleslime.png index 26b0ad82..cfb81f32 100644 Binary files a/mods/tinker/textures/items/edibleslime.png and b/mods/tinker/textures/items/edibleslime.png differ diff --git a/mods/tinker/textures/items/frypan/alumite_frypan_handle.png b/mods/tinker/textures/items/frypan/alumite_frypan_handle.png index ad050f8f..978e3418 100644 Binary files a/mods/tinker/textures/items/frypan/alumite_frypan_handle.png and b/mods/tinker/textures/items/frypan/alumite_frypan_handle.png differ diff --git a/mods/tinker/textures/items/frypan/alumite_frypan_head.png b/mods/tinker/textures/items/frypan/alumite_frypan_head.png index 408492ba..4c625f64 100644 Binary files a/mods/tinker/textures/items/frypan/alumite_frypan_head.png and b/mods/tinker/textures/items/frypan/alumite_frypan_head.png differ diff --git a/mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png b/mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png index 2931c19a..733ce65e 100644 Binary files a/mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png and b/mods/tinker/textures/items/frypan/alumite_frypan_head_broken.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png b/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png index 65cb31fc..f8f190ae 100644 Binary files a/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png and b/mods/tinker/textures/items/frypan/blueslime_frypan_handle.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_head.png b/mods/tinker/textures/items/frypan/blueslime_frypan_head.png index f637dae1..d5e8f414 100644 Binary files a/mods/tinker/textures/items/frypan/blueslime_frypan_head.png and b/mods/tinker/textures/items/frypan/blueslime_frypan_head.png differ diff --git a/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png b/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png index 477df4a6..1be73b99 100644 Binary files a/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png and b/mods/tinker/textures/items/frypan/blueslime_frypan_head_broken.png differ diff --git a/mods/tinker/textures/items/frypan/quartz_frypan_effect.png b/mods/tinker/textures/items/frypan/quartz_frypan_effect.png index db9c0b99..93e79193 100644 Binary files a/mods/tinker/textures/items/frypan/quartz_frypan_effect.png and b/mods/tinker/textures/items/frypan/quartz_frypan_effect.png differ diff --git a/mods/tinker/textures/items/frypan/silk_frypan_effect.png b/mods/tinker/textures/items/frypan/silk_frypan_effect.png index 5ca60417..5cb37256 100644 Binary files a/mods/tinker/textures/items/frypan/silk_frypan_effect.png and b/mods/tinker/textures/items/frypan/silk_frypan_effect.png differ diff --git a/mods/tinker/textures/items/frypan/steel_frypan_handle.png b/mods/tinker/textures/items/frypan/steel_frypan_handle.png index c9028009..711544c7 100644 Binary files a/mods/tinker/textures/items/frypan/steel_frypan_handle.png and b/mods/tinker/textures/items/frypan/steel_frypan_handle.png differ diff --git a/mods/tinker/textures/items/frypan/steel_frypan_head.png b/mods/tinker/textures/items/frypan/steel_frypan_head.png index 6e6b5caf..34e1d06a 100644 Binary files a/mods/tinker/textures/items/frypan/steel_frypan_head.png and b/mods/tinker/textures/items/frypan/steel_frypan_head.png differ diff --git a/mods/tinker/textures/items/frypan/steel_frypan_head_broken.png b/mods/tinker/textures/items/frypan/steel_frypan_head_broken.png index ce28f2e1..cd65f574 100644 Binary files a/mods/tinker/textures/items/frypan/steel_frypan_head_broken.png and b/mods/tinker/textures/items/frypan/steel_frypan_head_broken.png differ diff --git a/mods/tinker/textures/items/hammer/alumite_hammer_back.png b/mods/tinker/textures/items/hammer/alumite_hammer_back.png new file mode 100644 index 00000000..6b071788 Binary files /dev/null and b/mods/tinker/textures/items/hammer/alumite_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/alumite_hammer_front.png b/mods/tinker/textures/items/hammer/alumite_hammer_front.png new file mode 100644 index 00000000..fdb4bfd0 Binary files /dev/null and b/mods/tinker/textures/items/hammer/alumite_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/alumite_hammer_handle.png b/mods/tinker/textures/items/hammer/alumite_hammer_handle.png new file mode 100644 index 00000000..099a0172 Binary files /dev/null and b/mods/tinker/textures/items/hammer/alumite_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/alumite_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/alumite_hammer_handle_broken.png new file mode 100644 index 00000000..9f578078 Binary files /dev/null and b/mods/tinker/textures/items/hammer/alumite_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/alumite_hammer_head.png b/mods/tinker/textures/items/hammer/alumite_hammer_head.png new file mode 100644 index 00000000..d716c474 Binary files /dev/null and b/mods/tinker/textures/items/hammer/alumite_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/ardite_hammer_back.png b/mods/tinker/textures/items/hammer/ardite_hammer_back.png new file mode 100644 index 00000000..4a283879 Binary files /dev/null and b/mods/tinker/textures/items/hammer/ardite_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/ardite_hammer_front.png b/mods/tinker/textures/items/hammer/ardite_hammer_front.png new file mode 100644 index 00000000..f551d754 Binary files /dev/null and b/mods/tinker/textures/items/hammer/ardite_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/ardite_hammer_handle.png b/mods/tinker/textures/items/hammer/ardite_hammer_handle.png new file mode 100644 index 00000000..9944e4af Binary files /dev/null and b/mods/tinker/textures/items/hammer/ardite_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/ardite_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/ardite_hammer_handle_broken.png new file mode 100644 index 00000000..04239b4d Binary files /dev/null and b/mods/tinker/textures/items/hammer/ardite_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/ardite_hammer_head.png b/mods/tinker/textures/items/hammer/ardite_hammer_head.png new file mode 100644 index 00000000..cd7b7edb Binary files /dev/null and b/mods/tinker/textures/items/hammer/ardite_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/blaze_hammer_effect.png b/mods/tinker/textures/items/hammer/blaze_hammer_effect.png new file mode 100644 index 00000000..6dee26d0 Binary files /dev/null and b/mods/tinker/textures/items/hammer/blaze_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/blueslime_hammer_back.png b/mods/tinker/textures/items/hammer/blueslime_hammer_back.png new file mode 100644 index 00000000..06310889 Binary files /dev/null and b/mods/tinker/textures/items/hammer/blueslime_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/blueslime_hammer_front.png b/mods/tinker/textures/items/hammer/blueslime_hammer_front.png new file mode 100644 index 00000000..9f27b40f Binary files /dev/null and b/mods/tinker/textures/items/hammer/blueslime_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/blueslime_hammer_handle.png b/mods/tinker/textures/items/hammer/blueslime_hammer_handle.png new file mode 100644 index 00000000..e3475c98 Binary files /dev/null and b/mods/tinker/textures/items/hammer/blueslime_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/blueslime_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/blueslime_hammer_handle_broken.png new file mode 100644 index 00000000..e2f6bc1c Binary files /dev/null and b/mods/tinker/textures/items/hammer/blueslime_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/blueslime_hammer_head.png b/mods/tinker/textures/items/hammer/blueslime_hammer_head.png new file mode 100644 index 00000000..e62eaf5d Binary files /dev/null and b/mods/tinker/textures/items/hammer/blueslime_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/bone_hammer_back.png b/mods/tinker/textures/items/hammer/bone_hammer_back.png new file mode 100644 index 00000000..280767e9 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bone_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/bone_hammer_front.png b/mods/tinker/textures/items/hammer/bone_hammer_front.png new file mode 100644 index 00000000..decf55d4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bone_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/bone_hammer_handle.png b/mods/tinker/textures/items/hammer/bone_hammer_handle.png new file mode 100644 index 00000000..d5f99cf9 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bone_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/bone_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/bone_hammer_handle_broken.png new file mode 100644 index 00000000..7e390345 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bone_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/bone_hammer_head.png b/mods/tinker/textures/items/hammer/bone_hammer_head.png new file mode 100644 index 00000000..b07ff177 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bone_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/bronze_hammer_back.png b/mods/tinker/textures/items/hammer/bronze_hammer_back.png new file mode 100644 index 00000000..b5bfee1e Binary files /dev/null and b/mods/tinker/textures/items/hammer/bronze_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/bronze_hammer_front.png b/mods/tinker/textures/items/hammer/bronze_hammer_front.png new file mode 100644 index 00000000..e5e6a65d Binary files /dev/null and b/mods/tinker/textures/items/hammer/bronze_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/bronze_hammer_handle.png b/mods/tinker/textures/items/hammer/bronze_hammer_handle.png new file mode 100644 index 00000000..85607bb9 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bronze_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/bronze_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/bronze_hammer_handle_broken.png new file mode 100644 index 00000000..0772347a Binary files /dev/null and b/mods/tinker/textures/items/hammer/bronze_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/bronze_hammer_head.png b/mods/tinker/textures/items/hammer/bronze_hammer_head.png new file mode 100644 index 00000000..5b652f08 Binary files /dev/null and b/mods/tinker/textures/items/hammer/bronze_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/cactus_hammer_back.png b/mods/tinker/textures/items/hammer/cactus_hammer_back.png new file mode 100644 index 00000000..5ed473f4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cactus_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/cactus_hammer_front.png b/mods/tinker/textures/items/hammer/cactus_hammer_front.png new file mode 100644 index 00000000..c71d56bd Binary files /dev/null and b/mods/tinker/textures/items/hammer/cactus_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/cactus_hammer_handle.png b/mods/tinker/textures/items/hammer/cactus_hammer_handle.png new file mode 100644 index 00000000..6646c36e Binary files /dev/null and b/mods/tinker/textures/items/hammer/cactus_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/cactus_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/cactus_hammer_handle_broken.png new file mode 100644 index 00000000..75d0aa56 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cactus_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/cactus_hammer_head.png b/mods/tinker/textures/items/hammer/cactus_hammer_head.png new file mode 100644 index 00000000..86bdce86 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cactus_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/cobalt_hammer_back.png b/mods/tinker/textures/items/hammer/cobalt_hammer_back.png new file mode 100644 index 00000000..084e1bc9 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cobalt_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/cobalt_hammer_front.png b/mods/tinker/textures/items/hammer/cobalt_hammer_front.png new file mode 100644 index 00000000..7c8c8160 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cobalt_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/cobalt_hammer_handle.png b/mods/tinker/textures/items/hammer/cobalt_hammer_handle.png new file mode 100644 index 00000000..8cd6b244 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cobalt_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/cobalt_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/cobalt_hammer_handle_broken.png new file mode 100644 index 00000000..33018457 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cobalt_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/cobalt_hammer_head.png b/mods/tinker/textures/items/hammer/cobalt_hammer_head.png new file mode 100644 index 00000000..90224b50 Binary files /dev/null and b/mods/tinker/textures/items/hammer/cobalt_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/copper_hammer_back.png b/mods/tinker/textures/items/hammer/copper_hammer_back.png new file mode 100644 index 00000000..91e5e598 Binary files /dev/null and b/mods/tinker/textures/items/hammer/copper_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/copper_hammer_front.png b/mods/tinker/textures/items/hammer/copper_hammer_front.png new file mode 100644 index 00000000..5d13bce4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/copper_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/copper_hammer_handle.png b/mods/tinker/textures/items/hammer/copper_hammer_handle.png new file mode 100644 index 00000000..a3dec1e5 Binary files /dev/null and b/mods/tinker/textures/items/hammer/copper_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/copper_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/copper_hammer_handle_broken.png new file mode 100644 index 00000000..754cc941 Binary files /dev/null and b/mods/tinker/textures/items/hammer/copper_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/copper_hammer_head.png b/mods/tinker/textures/items/hammer/copper_hammer_head.png new file mode 100644 index 00000000..64fdfc4b Binary files /dev/null and b/mods/tinker/textures/items/hammer/copper_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/diamond_hammer_effect.png b/mods/tinker/textures/items/hammer/diamond_hammer_effect.png new file mode 100644 index 00000000..e320de5f Binary files /dev/null and b/mods/tinker/textures/items/hammer/diamond_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/electric_hammer_effect.png b/mods/tinker/textures/items/hammer/electric_hammer_effect.png new file mode 100644 index 00000000..5a706d37 Binary files /dev/null and b/mods/tinker/textures/items/hammer/electric_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/emerald_hammer_effect.png b/mods/tinker/textures/items/hammer/emerald_hammer_effect.png new file mode 100644 index 00000000..2ffec164 Binary files /dev/null and b/mods/tinker/textures/items/hammer/emerald_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/flint_hammer_back.png b/mods/tinker/textures/items/hammer/flint_hammer_back.png new file mode 100644 index 00000000..f89278b6 Binary files /dev/null and b/mods/tinker/textures/items/hammer/flint_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/flint_hammer_front.png b/mods/tinker/textures/items/hammer/flint_hammer_front.png new file mode 100644 index 00000000..3343e942 Binary files /dev/null and b/mods/tinker/textures/items/hammer/flint_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/flint_hammer_handle.png b/mods/tinker/textures/items/hammer/flint_hammer_handle.png new file mode 100644 index 00000000..4e46036a Binary files /dev/null and b/mods/tinker/textures/items/hammer/flint_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/flint_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/flint_hammer_handle_broken.png new file mode 100644 index 00000000..950b7ee5 Binary files /dev/null and b/mods/tinker/textures/items/hammer/flint_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/flint_hammer_head.png b/mods/tinker/textures/items/hammer/flint_hammer_head.png new file mode 100644 index 00000000..76708ce6 Binary files /dev/null and b/mods/tinker/textures/items/hammer/flint_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/ice_hammer_effect.png b/mods/tinker/textures/items/hammer/ice_hammer_effect.png new file mode 100644 index 00000000..feedb8ab Binary files /dev/null and b/mods/tinker/textures/items/hammer/ice_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/iron_hammer_back.png b/mods/tinker/textures/items/hammer/iron_hammer_back.png new file mode 100644 index 00000000..f933e5d9 Binary files /dev/null and b/mods/tinker/textures/items/hammer/iron_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/iron_hammer_front.png b/mods/tinker/textures/items/hammer/iron_hammer_front.png new file mode 100644 index 00000000..ed3db494 Binary files /dev/null and b/mods/tinker/textures/items/hammer/iron_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/iron_hammer_handle.png b/mods/tinker/textures/items/hammer/iron_hammer_handle.png new file mode 100644 index 00000000..f985f9e8 Binary files /dev/null and b/mods/tinker/textures/items/hammer/iron_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/iron_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/iron_hammer_handle_broken.png new file mode 100644 index 00000000..b6570da7 Binary files /dev/null and b/mods/tinker/textures/items/hammer/iron_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/iron_hammer_head.png b/mods/tinker/textures/items/hammer/iron_hammer_head.png new file mode 100644 index 00000000..9c46ba2e Binary files /dev/null and b/mods/tinker/textures/items/hammer/iron_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/lapis_hammer_effect.png b/mods/tinker/textures/items/hammer/lapis_hammer_effect.png new file mode 100644 index 00000000..ac1e8336 Binary files /dev/null and b/mods/tinker/textures/items/hammer/lapis_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/lava_hammer_effect.png b/mods/tinker/textures/items/hammer/lava_hammer_effect.png new file mode 100644 index 00000000..ee62bf34 Binary files /dev/null and b/mods/tinker/textures/items/hammer/lava_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/manyullyn_hammer_back.png b/mods/tinker/textures/items/hammer/manyullyn_hammer_back.png new file mode 100644 index 00000000..a792af92 Binary files /dev/null and b/mods/tinker/textures/items/hammer/manyullyn_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/manyullyn_hammer_front.png b/mods/tinker/textures/items/hammer/manyullyn_hammer_front.png new file mode 100644 index 00000000..fb841386 Binary files /dev/null and b/mods/tinker/textures/items/hammer/manyullyn_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/manyullyn_hammer_handle.png b/mods/tinker/textures/items/hammer/manyullyn_hammer_handle.png new file mode 100644 index 00000000..1767e1c4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/manyullyn_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/manyullyn_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/manyullyn_hammer_handle_broken.png new file mode 100644 index 00000000..22caae60 Binary files /dev/null and b/mods/tinker/textures/items/hammer/manyullyn_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/manyullyn_hammer_head.png b/mods/tinker/textures/items/hammer/manyullyn_hammer_head.png new file mode 100644 index 00000000..5f237bdb Binary files /dev/null and b/mods/tinker/textures/items/hammer/manyullyn_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/moss_hammer_effect.png b/mods/tinker/textures/items/hammer/moss_hammer_effect.png new file mode 100644 index 00000000..9d330cb4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/moss_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/necrotic_hammer_effect.png b/mods/tinker/textures/items/hammer/necrotic_hammer_effect.png new file mode 100644 index 00000000..6955c3fe Binary files /dev/null and b/mods/tinker/textures/items/hammer/necrotic_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/netherrack_hammer_back.png b/mods/tinker/textures/items/hammer/netherrack_hammer_back.png new file mode 100644 index 00000000..cab6a8a3 Binary files /dev/null and b/mods/tinker/textures/items/hammer/netherrack_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/netherrack_hammer_front.png b/mods/tinker/textures/items/hammer/netherrack_hammer_front.png new file mode 100644 index 00000000..7f579e32 Binary files /dev/null and b/mods/tinker/textures/items/hammer/netherrack_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/netherrack_hammer_handle.png b/mods/tinker/textures/items/hammer/netherrack_hammer_handle.png new file mode 100644 index 00000000..b47e1f00 Binary files /dev/null and b/mods/tinker/textures/items/hammer/netherrack_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/netherrack_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/netherrack_hammer_handle_broken.png new file mode 100644 index 00000000..61a41aec Binary files /dev/null and b/mods/tinker/textures/items/hammer/netherrack_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/netherrack_hammer_head.png b/mods/tinker/textures/items/hammer/netherrack_hammer_head.png new file mode 100644 index 00000000..d8e9dae2 Binary files /dev/null and b/mods/tinker/textures/items/hammer/netherrack_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/obsidian_hammer_back.png b/mods/tinker/textures/items/hammer/obsidian_hammer_back.png new file mode 100644 index 00000000..3bcd5a5a Binary files /dev/null and b/mods/tinker/textures/items/hammer/obsidian_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/obsidian_hammer_front.png b/mods/tinker/textures/items/hammer/obsidian_hammer_front.png new file mode 100644 index 00000000..4c864a67 Binary files /dev/null and b/mods/tinker/textures/items/hammer/obsidian_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/obsidian_hammer_handle.png b/mods/tinker/textures/items/hammer/obsidian_hammer_handle.png new file mode 100644 index 00000000..a29a410c Binary files /dev/null and b/mods/tinker/textures/items/hammer/obsidian_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/obsidian_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/obsidian_hammer_handle_broken.png new file mode 100644 index 00000000..025d4306 Binary files /dev/null and b/mods/tinker/textures/items/hammer/obsidian_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/obsidian_hammer_head.png b/mods/tinker/textures/items/hammer/obsidian_hammer_head.png new file mode 100644 index 00000000..d43ac741 Binary files /dev/null and b/mods/tinker/textures/items/hammer/obsidian_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/paper_hammer_back.png b/mods/tinker/textures/items/hammer/paper_hammer_back.png new file mode 100644 index 00000000..54900af4 Binary files /dev/null and b/mods/tinker/textures/items/hammer/paper_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/paper_hammer_front.png b/mods/tinker/textures/items/hammer/paper_hammer_front.png new file mode 100644 index 00000000..dcb9464c Binary files /dev/null and b/mods/tinker/textures/items/hammer/paper_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/paper_hammer_handle.png b/mods/tinker/textures/items/hammer/paper_hammer_handle.png new file mode 100644 index 00000000..10985cd8 Binary files /dev/null and b/mods/tinker/textures/items/hammer/paper_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/paper_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/paper_hammer_handle_broken.png new file mode 100644 index 00000000..bf0e7937 Binary files /dev/null and b/mods/tinker/textures/items/hammer/paper_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/paper_hammer_head.png b/mods/tinker/textures/items/hammer/paper_hammer_head.png new file mode 100644 index 00000000..483c021d Binary files /dev/null and b/mods/tinker/textures/items/hammer/paper_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/quartz_hammer_effect.png b/mods/tinker/textures/items/hammer/quartz_hammer_effect.png new file mode 100644 index 00000000..e48c5489 Binary files /dev/null and b/mods/tinker/textures/items/hammer/quartz_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/redstone_hammer_effect.png b/mods/tinker/textures/items/hammer/redstone_hammer_effect.png new file mode 100644 index 00000000..ed3acdac Binary files /dev/null and b/mods/tinker/textures/items/hammer/redstone_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/silk_hammer_effect.png b/mods/tinker/textures/items/hammer/silk_hammer_effect.png new file mode 100644 index 00000000..c3cdc364 Binary files /dev/null and b/mods/tinker/textures/items/hammer/silk_hammer_effect.png differ diff --git a/mods/tinker/textures/items/hammer/slime_hammer_back.png b/mods/tinker/textures/items/hammer/slime_hammer_back.png new file mode 100644 index 00000000..24c92799 Binary files /dev/null and b/mods/tinker/textures/items/hammer/slime_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/slime_hammer_front.png b/mods/tinker/textures/items/hammer/slime_hammer_front.png new file mode 100644 index 00000000..463d9d64 Binary files /dev/null and b/mods/tinker/textures/items/hammer/slime_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/slime_hammer_handle.png b/mods/tinker/textures/items/hammer/slime_hammer_handle.png new file mode 100644 index 00000000..96ff38e1 Binary files /dev/null and b/mods/tinker/textures/items/hammer/slime_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/slime_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/slime_hammer_handle_broken.png new file mode 100644 index 00000000..2c417bc8 Binary files /dev/null and b/mods/tinker/textures/items/hammer/slime_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/slime_hammer_head.png b/mods/tinker/textures/items/hammer/slime_hammer_head.png new file mode 100644 index 00000000..e0754951 Binary files /dev/null and b/mods/tinker/textures/items/hammer/slime_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/steel_hammer_back.png b/mods/tinker/textures/items/hammer/steel_hammer_back.png new file mode 100644 index 00000000..03148b88 Binary files /dev/null and b/mods/tinker/textures/items/hammer/steel_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/steel_hammer_front.png b/mods/tinker/textures/items/hammer/steel_hammer_front.png new file mode 100644 index 00000000..4a463e24 Binary files /dev/null and b/mods/tinker/textures/items/hammer/steel_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/steel_hammer_handle.png b/mods/tinker/textures/items/hammer/steel_hammer_handle.png new file mode 100644 index 00000000..65664304 Binary files /dev/null and b/mods/tinker/textures/items/hammer/steel_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/steel_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/steel_hammer_handle_broken.png new file mode 100644 index 00000000..395007d0 Binary files /dev/null and b/mods/tinker/textures/items/hammer/steel_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/steel_hammer_head.png b/mods/tinker/textures/items/hammer/steel_hammer_head.png new file mode 100644 index 00000000..fa987046 Binary files /dev/null and b/mods/tinker/textures/items/hammer/steel_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/stone_hammer_back.png b/mods/tinker/textures/items/hammer/stone_hammer_back.png new file mode 100644 index 00000000..c90ec376 Binary files /dev/null and b/mods/tinker/textures/items/hammer/stone_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/stone_hammer_front.png b/mods/tinker/textures/items/hammer/stone_hammer_front.png new file mode 100644 index 00000000..e4603ee7 Binary files /dev/null and b/mods/tinker/textures/items/hammer/stone_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/stone_hammer_handle.png b/mods/tinker/textures/items/hammer/stone_hammer_handle.png new file mode 100644 index 00000000..844689d7 Binary files /dev/null and b/mods/tinker/textures/items/hammer/stone_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/stone_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/stone_hammer_handle_broken.png new file mode 100644 index 00000000..b4a01478 Binary files /dev/null and b/mods/tinker/textures/items/hammer/stone_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/stone_hammer_head.png b/mods/tinker/textures/items/hammer/stone_hammer_head.png new file mode 100644 index 00000000..59cfb3dc Binary files /dev/null and b/mods/tinker/textures/items/hammer/stone_hammer_head.png differ diff --git a/mods/tinker/textures/items/hammer/wood_hammer_back.png b/mods/tinker/textures/items/hammer/wood_hammer_back.png new file mode 100644 index 00000000..d683fc67 Binary files /dev/null and b/mods/tinker/textures/items/hammer/wood_hammer_back.png differ diff --git a/mods/tinker/textures/items/hammer/wood_hammer_front.png b/mods/tinker/textures/items/hammer/wood_hammer_front.png new file mode 100644 index 00000000..42fb6283 Binary files /dev/null and b/mods/tinker/textures/items/hammer/wood_hammer_front.png differ diff --git a/mods/tinker/textures/items/hammer/wood_hammer_handle.png b/mods/tinker/textures/items/hammer/wood_hammer_handle.png new file mode 100644 index 00000000..baedada6 Binary files /dev/null and b/mods/tinker/textures/items/hammer/wood_hammer_handle.png differ diff --git a/mods/tinker/textures/items/hammer/wood_hammer_handle_broken.png b/mods/tinker/textures/items/hammer/wood_hammer_handle_broken.png new file mode 100644 index 00000000..19c5f66f Binary files /dev/null and b/mods/tinker/textures/items/hammer/wood_hammer_handle_broken.png differ diff --git a/mods/tinker/textures/items/hammer/wood_hammer_head.png b/mods/tinker/textures/items/hammer/wood_hammer_head.png new file mode 100644 index 00000000..a4653065 Binary files /dev/null and b/mods/tinker/textures/items/hammer/wood_hammer_head.png differ diff --git a/mods/tinker/textures/items/longsword/alumite_longsword_accessory.png b/mods/tinker/textures/items/longsword/alumite_longsword_accessory.png index 36082789..62777eeb 100644 Binary files a/mods/tinker/textures/items/longsword/alumite_longsword_accessory.png and b/mods/tinker/textures/items/longsword/alumite_longsword_accessory.png differ diff --git a/mods/tinker/textures/items/longsword/alumite_longsword_blade.png b/mods/tinker/textures/items/longsword/alumite_longsword_blade.png index ceeefb46..4452b696 100644 Binary files a/mods/tinker/textures/items/longsword/alumite_longsword_blade.png and b/mods/tinker/textures/items/longsword/alumite_longsword_blade.png differ diff --git a/mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png index 15d1f073..25c0f5a0 100644 Binary files a/mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png and b/mods/tinker/textures/items/longsword/alumite_longsword_blade_broken.png differ diff --git a/mods/tinker/textures/items/longsword/alumite_longsword_handle.png b/mods/tinker/textures/items/longsword/alumite_longsword_handle.png index f5f9114f..a9b2b27f 100644 Binary files a/mods/tinker/textures/items/longsword/alumite_longsword_handle.png and b/mods/tinker/textures/items/longsword/alumite_longsword_handle.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png b/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png index 971db07d..aef3133e 100644 Binary files a/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png and b/mods/tinker/textures/items/longsword/blueslime_longsword_accessory.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png b/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png index 87cb5341..c6592837 100644 Binary files a/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png and b/mods/tinker/textures/items/longsword/blueslime_longsword_blade.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png index 16459102..a5340fee 100644 Binary files a/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png and b/mods/tinker/textures/items/longsword/blueslime_longsword_blade_broken.png differ diff --git a/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png b/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png index 1a37e0ee..18c7af0f 100644 Binary files a/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png and b/mods/tinker/textures/items/longsword/blueslime_longsword_handle.png differ diff --git a/mods/tinker/textures/items/longsword/quartz_longsword_effect.png b/mods/tinker/textures/items/longsword/quartz_longsword_effect.png index fb8e1040..a2a53644 100644 Binary files a/mods/tinker/textures/items/longsword/quartz_longsword_effect.png and b/mods/tinker/textures/items/longsword/quartz_longsword_effect.png differ diff --git a/mods/tinker/textures/items/longsword/silk_longsword_effect.png b/mods/tinker/textures/items/longsword/silk_longsword_effect.png index ec21a744..1f501cf2 100644 Binary files a/mods/tinker/textures/items/longsword/silk_longsword_effect.png and b/mods/tinker/textures/items/longsword/silk_longsword_effect.png differ diff --git a/mods/tinker/textures/items/longsword/steel_longsword_accessory.png b/mods/tinker/textures/items/longsword/steel_longsword_accessory.png index 4bcfbe8c..5125c61f 100644 Binary files a/mods/tinker/textures/items/longsword/steel_longsword_accessory.png and b/mods/tinker/textures/items/longsword/steel_longsword_accessory.png differ diff --git a/mods/tinker/textures/items/longsword/steel_longsword_blade.png b/mods/tinker/textures/items/longsword/steel_longsword_blade.png index 2f4aa6ee..0be314f8 100644 Binary files a/mods/tinker/textures/items/longsword/steel_longsword_blade.png and b/mods/tinker/textures/items/longsword/steel_longsword_blade.png differ diff --git a/mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png b/mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png index d6b2e6df..69a7f8bf 100644 Binary files a/mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png and b/mods/tinker/textures/items/longsword/steel_longsword_blade_broken.png differ diff --git a/mods/tinker/textures/items/longsword/steel_longsword_handle.png b/mods/tinker/textures/items/longsword/steel_longsword_handle.png index 68c7e7e0..d63b2d20 100644 Binary files a/mods/tinker/textures/items/longsword/steel_longsword_handle.png and b/mods/tinker/textures/items/longsword/steel_longsword_handle.png differ diff --git a/mods/tinker/textures/items/lumberaxe/cactus_lumberaxe_binding.png b/mods/tinker/textures/items/lumberaxe/cactus_lumberaxe_binding.png index fb8c714e..9d7959db 100644 Binary files a/mods/tinker/textures/items/lumberaxe/cactus_lumberaxe_binding.png and b/mods/tinker/textures/items/lumberaxe/cactus_lumberaxe_binding.png differ diff --git a/mods/tinker/textures/items/lumberaxe/wood_lumberaxe_shield.png b/mods/tinker/textures/items/lumberaxe/wood_lumberaxe_shield.png index 578d4fdb..d46f03f5 100644 Binary files a/mods/tinker/textures/items/lumberaxe/wood_lumberaxe_shield.png and b/mods/tinker/textures/items/lumberaxe/wood_lumberaxe_shield.png differ diff --git a/mods/tinker/textures/items/materials/blank_cast.png b/mods/tinker/textures/items/materials/blank_cast.png index a128b702..3b0fc0a9 100644 Binary files a/mods/tinker/textures/items/materials/blank_cast.png and b/mods/tinker/textures/items/materials/blank_cast.png differ diff --git a/mods/tinker/textures/items/materials/blank_pattern.png b/mods/tinker/textures/items/materials/blank_pattern.png index 2d80c7fd..a0888a28 100644 Binary files a/mods/tinker/textures/items/materials/blank_pattern.png and b/mods/tinker/textures/items/materials/blank_pattern.png differ diff --git a/mods/tinker/textures/items/materials/bone_chunk.png b/mods/tinker/textures/items/materials/bone_chunk.png index 1ab2a7d7..10839517 100644 Binary files a/mods/tinker/textures/items/materials/bone_chunk.png and b/mods/tinker/textures/items/materials/bone_chunk.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alubrass.png b/mods/tinker/textures/items/materials/bucket_alubrass.png index c738e566..00d1819d 100644 Binary files a/mods/tinker/textures/items/materials/bucket_alubrass.png and b/mods/tinker/textures/items/materials/bucket_alubrass.png differ diff --git a/mods/tinker/textures/items/materials/bucket_aluminum.png b/mods/tinker/textures/items/materials/bucket_aluminum.png index 8f11b3a0..120b4c1e 100644 Binary files a/mods/tinker/textures/items/materials/bucket_aluminum.png and b/mods/tinker/textures/items/materials/bucket_aluminum.png differ diff --git a/mods/tinker/textures/items/materials/bucket_alumite.png b/mods/tinker/textures/items/materials/bucket_alumite.png index 73b70ae9..4ca65705 100644 Binary files a/mods/tinker/textures/items/materials/bucket_alumite.png and b/mods/tinker/textures/items/materials/bucket_alumite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_angmallen.png b/mods/tinker/textures/items/materials/bucket_angmallen.png index e2692a42..00d1819d 100644 Binary files a/mods/tinker/textures/items/materials/bucket_angmallen.png and b/mods/tinker/textures/items/materials/bucket_angmallen.png differ diff --git a/mods/tinker/textures/items/materials/bucket_ardite.png b/mods/tinker/textures/items/materials/bucket_ardite.png index db8c6ced..0db2887b 100644 Binary files a/mods/tinker/textures/items/materials/bucket_ardite.png and b/mods/tinker/textures/items/materials/bucket_ardite.png differ diff --git a/mods/tinker/textures/items/materials/bucket_bronze.png b/mods/tinker/textures/items/materials/bucket_bronze.png index 1dc00e0d..fdaf58bf 100644 Binary files a/mods/tinker/textures/items/materials/bucket_bronze.png and b/mods/tinker/textures/items/materials/bucket_bronze.png differ diff --git a/mods/tinker/textures/items/materials/bucket_cobalt.png b/mods/tinker/textures/items/materials/bucket_cobalt.png index 5f5735a6..b2475312 100644 Binary files a/mods/tinker/textures/items/materials/bucket_cobalt.png and b/mods/tinker/textures/items/materials/bucket_cobalt.png differ diff --git a/mods/tinker/textures/items/materials/bucket_copper.png b/mods/tinker/textures/items/materials/bucket_copper.png index ed62cab5..fe2c9217 100644 Binary files a/mods/tinker/textures/items/materials/bucket_copper.png and b/mods/tinker/textures/items/materials/bucket_copper.png differ diff --git a/mods/tinker/textures/items/materials/bucket_dsteel.png b/mods/tinker/textures/items/materials/bucket_dsteel.png index 43b5cb98..00d1819d 100644 Binary files a/mods/tinker/textures/items/materials/bucket_dsteel.png and b/mods/tinker/textures/items/materials/bucket_dsteel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_gold.png b/mods/tinker/textures/items/materials/bucket_gold.png index ec0f0faf..b3de504b 100644 Binary files a/mods/tinker/textures/items/materials/bucket_gold.png and b/mods/tinker/textures/items/materials/bucket_gold.png differ diff --git a/mods/tinker/textures/items/materials/bucket_heptazion.png b/mods/tinker/textures/items/materials/bucket_heptazion.png index ac1383f2..00d1819d 100644 Binary files a/mods/tinker/textures/items/materials/bucket_heptazion.png and b/mods/tinker/textures/items/materials/bucket_heptazion.png differ diff --git a/mods/tinker/textures/items/materials/bucket_iron.png b/mods/tinker/textures/items/materials/bucket_iron.png index 81129fca..be1b08ef 100644 Binary files a/mods/tinker/textures/items/materials/bucket_iron.png and b/mods/tinker/textures/items/materials/bucket_iron.png differ diff --git a/mods/tinker/textures/items/materials/bucket_manyullyn.png b/mods/tinker/textures/items/materials/bucket_manyullyn.png index 5ab1ffd0..604968ee 100644 Binary files a/mods/tinker/textures/items/materials/bucket_manyullyn.png and b/mods/tinker/textures/items/materials/bucket_manyullyn.png differ diff --git a/mods/tinker/textures/items/materials/bucket_obsidian.png b/mods/tinker/textures/items/materials/bucket_obsidian.png index b386f469..510dbddb 100644 Binary files a/mods/tinker/textures/items/materials/bucket_obsidian.png and b/mods/tinker/textures/items/materials/bucket_obsidian.png differ diff --git a/mods/tinker/textures/items/materials/bucket_steel.png b/mods/tinker/textures/items/materials/bucket_steel.png index 453467dc..8453b904 100644 Binary files a/mods/tinker/textures/items/materials/bucket_steel.png and b/mods/tinker/textures/items/materials/bucket_steel.png differ diff --git a/mods/tinker/textures/items/materials/bucket_tin.png b/mods/tinker/textures/items/materials/bucket_tin.png index 2048e43c..f0ac1f48 100644 Binary files a/mods/tinker/textures/items/materials/bucket_tin.png and b/mods/tinker/textures/items/materials/bucket_tin.png differ diff --git a/mods/tinker/textures/items/materials/cast_axe.png b/mods/tinker/textures/items/materials/cast_axe.png index 188a7421..cd1007a3 100644 Binary files a/mods/tinker/textures/items/materials/cast_axe.png and b/mods/tinker/textures/items/materials/cast_axe.png differ diff --git a/mods/tinker/textures/items/materials/cast_broadaxe.png b/mods/tinker/textures/items/materials/cast_broadaxe.png index f13b86a6..3b0fc0a9 100644 Binary files a/mods/tinker/textures/items/materials/cast_broadaxe.png and b/mods/tinker/textures/items/materials/cast_broadaxe.png differ diff --git a/mods/tinker/textures/items/materials/cast_chisel.png b/mods/tinker/textures/items/materials/cast_chisel.png index 844fcbd1..3e4ebe30 100644 Binary files a/mods/tinker/textures/items/materials/cast_chisel.png and b/mods/tinker/textures/items/materials/cast_chisel.png differ diff --git a/mods/tinker/textures/items/materials/cast_crossbar.png b/mods/tinker/textures/items/materials/cast_crossbar.png index fecc9fec..e6d5766b 100644 Binary files a/mods/tinker/textures/items/materials/cast_crossbar.png and b/mods/tinker/textures/items/materials/cast_crossbar.png differ diff --git a/mods/tinker/textures/items/materials/cast_frypan.png b/mods/tinker/textures/items/materials/cast_frypan.png index 05fd4699..0a2fb8ac 100644 Binary files a/mods/tinker/textures/items/materials/cast_frypan.png and b/mods/tinker/textures/items/materials/cast_frypan.png differ diff --git a/mods/tinker/textures/items/materials/cast_hammerhead.png b/mods/tinker/textures/items/materials/cast_hammerhead.png new file mode 100644 index 00000000..9ecb01e9 Binary files /dev/null and b/mods/tinker/textures/items/materials/cast_hammerhead.png differ diff --git a/mods/tinker/textures/items/materials/cast_ingot.png b/mods/tinker/textures/items/materials/cast_ingot.png index b9397f74..1467d176 100644 Binary files a/mods/tinker/textures/items/materials/cast_ingot.png and b/mods/tinker/textures/items/materials/cast_ingot.png differ diff --git a/mods/tinker/textures/items/materials/cast_knifeblade.png b/mods/tinker/textures/items/materials/cast_knifeblade.png index ee38a89d..b407708b 100644 Binary files a/mods/tinker/textures/items/materials/cast_knifeblade.png and b/mods/tinker/textures/items/materials/cast_knifeblade.png differ diff --git a/mods/tinker/textures/items/materials/cast_largeguard.png b/mods/tinker/textures/items/materials/cast_largeguard.png index 6ce33ea0..ba0f5d95 100644 Binary files a/mods/tinker/textures/items/materials/cast_largeguard.png and b/mods/tinker/textures/items/materials/cast_largeguard.png differ diff --git a/mods/tinker/textures/items/materials/cast_largerod.png b/mods/tinker/textures/items/materials/cast_largerod.png index febef0f8..1358d805 100644 Binary files a/mods/tinker/textures/items/materials/cast_largerod.png and b/mods/tinker/textures/items/materials/cast_largerod.png differ diff --git a/mods/tinker/textures/items/materials/cast_mediumguard.png b/mods/tinker/textures/items/materials/cast_mediumguard.png index 8ce28266..2dcf0812 100644 Binary files a/mods/tinker/textures/items/materials/cast_mediumguard.png and b/mods/tinker/textures/items/materials/cast_mediumguard.png differ diff --git a/mods/tinker/textures/items/materials/cast_pickaxe.png b/mods/tinker/textures/items/materials/cast_pickaxe.png index 283bd196..236f67db 100644 Binary files a/mods/tinker/textures/items/materials/cast_pickaxe.png and b/mods/tinker/textures/items/materials/cast_pickaxe.png differ diff --git a/mods/tinker/textures/items/materials/cast_rod.png b/mods/tinker/textures/items/materials/cast_rod.png index c7c1e710..02a8d82a 100644 Binary files a/mods/tinker/textures/items/materials/cast_rod.png and b/mods/tinker/textures/items/materials/cast_rod.png differ diff --git a/mods/tinker/textures/items/materials/cast_shovel.png b/mods/tinker/textures/items/materials/cast_shovel.png index 0a833ea1..32ed3383 100644 Binary files a/mods/tinker/textures/items/materials/cast_shovel.png and b/mods/tinker/textures/items/materials/cast_shovel.png differ diff --git a/mods/tinker/textures/items/materials/cast_sign.png b/mods/tinker/textures/items/materials/cast_sign.png index ea9e1535..6ea2b9b4 100644 Binary files a/mods/tinker/textures/items/materials/cast_sign.png and b/mods/tinker/textures/items/materials/cast_sign.png differ diff --git a/mods/tinker/textures/items/materials/cast_spike.png b/mods/tinker/textures/items/materials/cast_spike.png index 80a972c3..3b0fc0a9 100644 Binary files a/mods/tinker/textures/items/materials/cast_spike.png and b/mods/tinker/textures/items/materials/cast_spike.png differ diff --git a/mods/tinker/textures/items/materials/cast_swordblade.png b/mods/tinker/textures/items/materials/cast_swordblade.png index ca2a4698..2eff7f2c 100644 Binary files a/mods/tinker/textures/items/materials/cast_swordblade.png and b/mods/tinker/textures/items/materials/cast_swordblade.png differ diff --git a/mods/tinker/textures/items/materials/grout.png b/mods/tinker/textures/items/materials/grout.png index 0295bbe7..c7fcafff 100644 Binary files a/mods/tinker/textures/items/materials/grout.png and b/mods/tinker/textures/items/materials/grout.png differ diff --git a/mods/tinker/textures/items/materials/material_alubrassingot.png b/mods/tinker/textures/items/materials/material_alubrassingot.png index 91def146..6e8a9172 100644 Binary files a/mods/tinker/textures/items/materials/material_alubrassingot.png and b/mods/tinker/textures/items/materials/material_alubrassingot.png differ diff --git a/mods/tinker/textures/items/materials/material_aluminumingot.png b/mods/tinker/textures/items/materials/material_aluminumingot.png index e40c76b0..4852a31b 100644 Binary files a/mods/tinker/textures/items/materials/material_aluminumingot.png and b/mods/tinker/textures/items/materials/material_aluminumingot.png differ diff --git a/mods/tinker/textures/items/materials/material_aluminumraw.png b/mods/tinker/textures/items/materials/material_aluminumraw.png index 90491afd..36ca158a 100644 Binary files a/mods/tinker/textures/items/materials/material_aluminumraw.png and b/mods/tinker/textures/items/materials/material_aluminumraw.png differ diff --git a/mods/tinker/textures/items/materials/material_alumiteingot.png b/mods/tinker/textures/items/materials/material_alumiteingot.png index cc790fa0..8779fec3 100644 Binary files a/mods/tinker/textures/items/materials/material_alumiteingot.png and b/mods/tinker/textures/items/materials/material_alumiteingot.png differ diff --git a/mods/tinker/textures/items/materials/material_arditeingot.png b/mods/tinker/textures/items/materials/material_arditeingot.png index ded87902..87eeea9a 100644 Binary files a/mods/tinker/textures/items/materials/material_arditeingot.png and b/mods/tinker/textures/items/materials/material_arditeingot.png differ diff --git a/mods/tinker/textures/items/materials/material_blueslimecrystal.png b/mods/tinker/textures/items/materials/material_blueslimecrystal.png index 5e73a91e..d13bc60f 100644 Binary files a/mods/tinker/textures/items/materials/material_blueslimecrystal.png and b/mods/tinker/textures/items/materials/material_blueslimecrystal.png differ diff --git a/mods/tinker/textures/items/materials/material_bronzeingot.png b/mods/tinker/textures/items/materials/material_bronzeingot.png index f280bcc2..980be319 100644 Binary files a/mods/tinker/textures/items/materials/material_bronzeingot.png and b/mods/tinker/textures/items/materials/material_bronzeingot.png differ diff --git a/mods/tinker/textures/items/materials/material_cobaltingot.png b/mods/tinker/textures/items/materials/material_cobaltingot.png index 628e22f1..b623a303 100644 Binary files a/mods/tinker/textures/items/materials/material_cobaltingot.png and b/mods/tinker/textures/items/materials/material_cobaltingot.png differ diff --git a/mods/tinker/textures/items/materials/material_copperingot.png b/mods/tinker/textures/items/materials/material_copperingot.png index 2e35ca4d..a6525e74 100644 Binary files a/mods/tinker/textures/items/materials/material_copperingot.png and b/mods/tinker/textures/items/materials/material_copperingot.png differ diff --git a/mods/tinker/textures/items/materials/material_fancydiamond.png b/mods/tinker/textures/items/materials/material_fancydiamond.png index b559100c..c4529093 100644 Binary files a/mods/tinker/textures/items/materials/material_fancydiamond.png and b/mods/tinker/textures/items/materials/material_fancydiamond.png differ diff --git a/mods/tinker/textures/items/materials/material_lavacrystal.png b/mods/tinker/textures/items/materials/material_lavacrystal.png index 5ea6ef65..181af72c 100644 Binary files a/mods/tinker/textures/items/materials/material_lavacrystal.png and b/mods/tinker/textures/items/materials/material_lavacrystal.png differ diff --git a/mods/tinker/textures/items/materials/material_manyullyningot.png b/mods/tinker/textures/items/materials/material_manyullyningot.png index 447477cd..a9181b76 100644 Binary files a/mods/tinker/textures/items/materials/material_manyullyningot.png and b/mods/tinker/textures/items/materials/material_manyullyningot.png differ diff --git a/mods/tinker/textures/items/materials/material_mossball.png b/mods/tinker/textures/items/materials/material_mossball.png index 47b8e172..7ab0f599 100644 Binary files a/mods/tinker/textures/items/materials/material_mossball.png and b/mods/tinker/textures/items/materials/material_mossball.png differ diff --git a/mods/tinker/textures/items/materials/material_necroticbone.png b/mods/tinker/textures/items/materials/material_necroticbone.png index 22ddb2c0..db1a1cb5 100644 Binary files a/mods/tinker/textures/items/materials/material_necroticbone.png and b/mods/tinker/textures/items/materials/material_necroticbone.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_alubrass.png b/mods/tinker/textures/items/materials/material_nugget_alubrass.png index 4f7617e7..4140dabe 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_alubrass.png and b/mods/tinker/textures/items/materials/material_nugget_alubrass.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_aluminum.png b/mods/tinker/textures/items/materials/material_nugget_aluminum.png index 52ea4012..55f121ab 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_aluminum.png and b/mods/tinker/textures/items/materials/material_nugget_aluminum.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_copper.png b/mods/tinker/textures/items/materials/material_nugget_copper.png index 4951e9d4..93e3d4c4 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_copper.png and b/mods/tinker/textures/items/materials/material_nugget_copper.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_iron.png b/mods/tinker/textures/items/materials/material_nugget_iron.png index c19df0c4..7bc4a31a 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_iron.png and b/mods/tinker/textures/items/materials/material_nugget_iron.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_silver.png b/mods/tinker/textures/items/materials/material_nugget_silver.png index 27cbf19b..eb05db80 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_silver.png and b/mods/tinker/textures/items/materials/material_nugget_silver.png differ diff --git a/mods/tinker/textures/items/materials/material_nugget_tin.png b/mods/tinker/textures/items/materials/material_nugget_tin.png index 0d0973fd..662496ee 100644 Binary files a/mods/tinker/textures/items/materials/material_nugget_tin.png and b/mods/tinker/textures/items/materials/material_nugget_tin.png differ diff --git a/mods/tinker/textures/items/materials/material_obsidianingot.png b/mods/tinker/textures/items/materials/material_obsidianingot.png index 18901dce..165ad7b4 100644 Binary files a/mods/tinker/textures/items/materials/material_obsidianingot.png and b/mods/tinker/textures/items/materials/material_obsidianingot.png differ diff --git a/mods/tinker/textures/items/materials/material_paperstack.png b/mods/tinker/textures/items/materials/material_paperstack.png index 139dfb4f..cd3b7102 100644 Binary files a/mods/tinker/textures/items/materials/material_paperstack.png and b/mods/tinker/textures/items/materials/material_paperstack.png differ diff --git a/mods/tinker/textures/items/materials/material_searedbrick.png b/mods/tinker/textures/items/materials/material_searedbrick.png index 75ec1ba8..a3fb1194 100644 Binary files a/mods/tinker/textures/items/materials/material_searedbrick.png and b/mods/tinker/textures/items/materials/material_searedbrick.png differ diff --git a/mods/tinker/textures/items/materials/material_silkycloth.png b/mods/tinker/textures/items/materials/material_silkycloth.png index aa966581..8bd9a3e9 100644 Binary files a/mods/tinker/textures/items/materials/material_silkycloth.png and b/mods/tinker/textures/items/materials/material_silkycloth.png differ diff --git a/mods/tinker/textures/items/materials/material_silkyjewel.png b/mods/tinker/textures/items/materials/material_silkyjewel.png index a2bfbc04..6740ce22 100644 Binary files a/mods/tinker/textures/items/materials/material_silkyjewel.png and b/mods/tinker/textures/items/materials/material_silkyjewel.png differ diff --git a/mods/tinker/textures/items/materials/material_steelingot.png b/mods/tinker/textures/items/materials/material_steelingot.png index 591b3f2e..9b9e1220 100644 Binary files a/mods/tinker/textures/items/materials/material_steelingot.png and b/mods/tinker/textures/items/materials/material_steelingot.png differ diff --git a/mods/tinker/textures/items/materials/material_tiningot.png b/mods/tinker/textures/items/materials/material_tiningot.png index c6027544..009e475b 100644 Binary files a/mods/tinker/textures/items/materials/material_tiningot.png and b/mods/tinker/textures/items/materials/material_tiningot.png differ diff --git a/mods/tinker/textures/items/materials/paper_chunk.png b/mods/tinker/textures/items/materials/paper_chunk.png index 07e06e7a..4b505c7a 100644 Binary files a/mods/tinker/textures/items/materials/paper_chunk.png and b/mods/tinker/textures/items/materials/paper_chunk.png differ diff --git a/mods/tinker/textures/items/materials/pattern_axe.png b/mods/tinker/textures/items/materials/pattern_axe.png index 832ad9f0..cbfcc4dc 100644 Binary files a/mods/tinker/textures/items/materials/pattern_axe.png and b/mods/tinker/textures/items/materials/pattern_axe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_binding.png b/mods/tinker/textures/items/materials/pattern_binding.png index 15dd2851..d359d9d7 100644 Binary files a/mods/tinker/textures/items/materials/pattern_binding.png and b/mods/tinker/textures/items/materials/pattern_binding.png differ diff --git a/mods/tinker/textures/items/materials/pattern_broadaxe.png b/mods/tinker/textures/items/materials/pattern_broadaxe.png index 893826a9..b6461fe9 100644 Binary files a/mods/tinker/textures/items/materials/pattern_broadaxe.png and b/mods/tinker/textures/items/materials/pattern_broadaxe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_chisel.png b/mods/tinker/textures/items/materials/pattern_chisel.png index 3dc012da..68e1557a 100644 Binary files a/mods/tinker/textures/items/materials/pattern_chisel.png and b/mods/tinker/textures/items/materials/pattern_chisel.png differ diff --git a/mods/tinker/textures/items/materials/pattern_crossbar.png b/mods/tinker/textures/items/materials/pattern_crossbar.png index ec08b017..b940f83d 100644 Binary files a/mods/tinker/textures/items/materials/pattern_crossbar.png and b/mods/tinker/textures/items/materials/pattern_crossbar.png differ diff --git a/mods/tinker/textures/items/materials/pattern_frypan.png b/mods/tinker/textures/items/materials/pattern_frypan.png index 34d439ab..aee08dde 100644 Binary files a/mods/tinker/textures/items/materials/pattern_frypan.png and b/mods/tinker/textures/items/materials/pattern_frypan.png differ diff --git a/mods/tinker/textures/items/materials/pattern_hammerhead.png b/mods/tinker/textures/items/materials/pattern_hammerhead.png new file mode 100644 index 00000000..1851e744 Binary files /dev/null and b/mods/tinker/textures/items/materials/pattern_hammerhead.png differ diff --git a/mods/tinker/textures/items/materials/pattern_ingot.png b/mods/tinker/textures/items/materials/pattern_ingot.png index 8c67a7a4..40bb221c 100644 Binary files a/mods/tinker/textures/items/materials/pattern_ingot.png and b/mods/tinker/textures/items/materials/pattern_ingot.png differ diff --git a/mods/tinker/textures/items/materials/pattern_knifeblade.png b/mods/tinker/textures/items/materials/pattern_knifeblade.png index ab7b9019..2a584832 100644 Binary files a/mods/tinker/textures/items/materials/pattern_knifeblade.png and b/mods/tinker/textures/items/materials/pattern_knifeblade.png differ diff --git a/mods/tinker/textures/items/materials/pattern_largeguard.png b/mods/tinker/textures/items/materials/pattern_largeguard.png index 7b410729..f3b23c12 100644 Binary files a/mods/tinker/textures/items/materials/pattern_largeguard.png and b/mods/tinker/textures/items/materials/pattern_largeguard.png differ diff --git a/mods/tinker/textures/items/materials/pattern_largerod.png b/mods/tinker/textures/items/materials/pattern_largerod.png index ec964575..f535e8e4 100644 Binary files a/mods/tinker/textures/items/materials/pattern_largerod.png and b/mods/tinker/textures/items/materials/pattern_largerod.png differ diff --git a/mods/tinker/textures/items/materials/pattern_mediumguard.png b/mods/tinker/textures/items/materials/pattern_mediumguard.png index 206e33ba..7744264d 100644 Binary files a/mods/tinker/textures/items/materials/pattern_mediumguard.png and b/mods/tinker/textures/items/materials/pattern_mediumguard.png differ diff --git a/mods/tinker/textures/items/materials/pattern_pickaxe.png b/mods/tinker/textures/items/materials/pattern_pickaxe.png index 5eb13bf2..e041cd08 100644 Binary files a/mods/tinker/textures/items/materials/pattern_pickaxe.png and b/mods/tinker/textures/items/materials/pattern_pickaxe.png differ diff --git a/mods/tinker/textures/items/materials/pattern_rod.png b/mods/tinker/textures/items/materials/pattern_rod.png index abface3a..938add37 100644 Binary files a/mods/tinker/textures/items/materials/pattern_rod.png and b/mods/tinker/textures/items/materials/pattern_rod.png differ diff --git a/mods/tinker/textures/items/materials/pattern_shovel.png b/mods/tinker/textures/items/materials/pattern_shovel.png index 99870cf9..f64fb0a2 100644 Binary files a/mods/tinker/textures/items/materials/pattern_shovel.png and b/mods/tinker/textures/items/materials/pattern_shovel.png differ diff --git a/mods/tinker/textures/items/materials/pattern_sign.png b/mods/tinker/textures/items/materials/pattern_sign.png index 29a71102..35858c3b 100644 Binary files a/mods/tinker/textures/items/materials/pattern_sign.png and b/mods/tinker/textures/items/materials/pattern_sign.png differ diff --git a/mods/tinker/textures/items/materials/pattern_spike.png b/mods/tinker/textures/items/materials/pattern_spike.png index d0a42c99..ea58bee7 100644 Binary files a/mods/tinker/textures/items/materials/pattern_spike.png and b/mods/tinker/textures/items/materials/pattern_spike.png differ diff --git a/mods/tinker/textures/items/materials/pattern_swordblade.png b/mods/tinker/textures/items/materials/pattern_swordblade.png index 8eac2c4d..6546ee66 100644 Binary files a/mods/tinker/textures/items/materials/pattern_swordblade.png and b/mods/tinker/textures/items/materials/pattern_swordblade.png differ diff --git a/mods/tinker/textures/items/materials/tinkerbook_diary.png b/mods/tinker/textures/items/materials/tinkerbook_diary.png index dcc9b60a..ecfdbad2 100644 Binary files a/mods/tinker/textures/items/materials/tinkerbook_diary.png and b/mods/tinker/textures/items/materials/tinkerbook_diary.png differ diff --git a/mods/tinker/textures/items/mattock/alumite_mattock_back.png b/mods/tinker/textures/items/mattock/alumite_mattock_back.png index d97146f6..20155eb5 100644 Binary files a/mods/tinker/textures/items/mattock/alumite_mattock_back.png and b/mods/tinker/textures/items/mattock/alumite_mattock_back.png differ diff --git a/mods/tinker/textures/items/mattock/alumite_mattock_handle.png b/mods/tinker/textures/items/mattock/alumite_mattock_handle.png index dc586214..e750f724 100644 Binary files a/mods/tinker/textures/items/mattock/alumite_mattock_handle.png and b/mods/tinker/textures/items/mattock/alumite_mattock_handle.png differ diff --git a/mods/tinker/textures/items/mattock/alumite_mattock_head.png b/mods/tinker/textures/items/mattock/alumite_mattock_head.png index 1565fff8..91a2c455 100644 Binary files a/mods/tinker/textures/items/mattock/alumite_mattock_head.png and b/mods/tinker/textures/items/mattock/alumite_mattock_head.png differ diff --git a/mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png b/mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png index 7142adec..4828acd0 100644 Binary files a/mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png and b/mods/tinker/textures/items/mattock/alumite_mattock_head_broken.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_back.png b/mods/tinker/textures/items/mattock/blueslime_mattock_back.png index 02ae7af5..ed6520f0 100644 Binary files a/mods/tinker/textures/items/mattock/blueslime_mattock_back.png and b/mods/tinker/textures/items/mattock/blueslime_mattock_back.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png b/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png index 8bd78047..f04295ca 100644 Binary files a/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png and b/mods/tinker/textures/items/mattock/blueslime_mattock_handle.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_head.png b/mods/tinker/textures/items/mattock/blueslime_mattock_head.png index a446f634..dd28eba5 100644 Binary files a/mods/tinker/textures/items/mattock/blueslime_mattock_head.png and b/mods/tinker/textures/items/mattock/blueslime_mattock_head.png differ diff --git a/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png b/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png index afff7fce..a82a3e05 100644 Binary files a/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png and b/mods/tinker/textures/items/mattock/blueslime_mattock_head_broken.png differ diff --git a/mods/tinker/textures/items/mattock/silk_mattock_effect.png b/mods/tinker/textures/items/mattock/silk_mattock_effect.png index 0d07905c..31037ff1 100644 Binary files a/mods/tinker/textures/items/mattock/silk_mattock_effect.png and b/mods/tinker/textures/items/mattock/silk_mattock_effect.png differ diff --git a/mods/tinker/textures/items/mattock/steel_mattock_back.png b/mods/tinker/textures/items/mattock/steel_mattock_back.png index e666b8df..a4b4ba6d 100644 Binary files a/mods/tinker/textures/items/mattock/steel_mattock_back.png and b/mods/tinker/textures/items/mattock/steel_mattock_back.png differ diff --git a/mods/tinker/textures/items/mattock/steel_mattock_handle.png b/mods/tinker/textures/items/mattock/steel_mattock_handle.png index b495c277..880395fc 100644 Binary files a/mods/tinker/textures/items/mattock/steel_mattock_handle.png and b/mods/tinker/textures/items/mattock/steel_mattock_handle.png differ diff --git a/mods/tinker/textures/items/mattock/steel_mattock_head.png b/mods/tinker/textures/items/mattock/steel_mattock_head.png index 726c1f4c..3728338e 100644 Binary files a/mods/tinker/textures/items/mattock/steel_mattock_head.png and b/mods/tinker/textures/items/mattock/steel_mattock_head.png differ diff --git a/mods/tinker/textures/items/mattock/steel_mattock_head_broken.png b/mods/tinker/textures/items/mattock/steel_mattock_head_broken.png index e4819723..6b6b56e8 100644 Binary files a/mods/tinker/textures/items/mattock/steel_mattock_head_broken.png and b/mods/tinker/textures/items/mattock/steel_mattock_head_broken.png differ diff --git a/mods/tinker/textures/items/metalball.png b/mods/tinker/textures/items/metalball.png index b6e7f450..7e8f33bf 100644 Binary files a/mods/tinker/textures/items/metalball.png and b/mods/tinker/textures/items/metalball.png differ diff --git a/mods/tinker/textures/items/miniheart_red.png b/mods/tinker/textures/items/miniheart_red.png index 54125c7f..258b6303 100644 Binary files a/mods/tinker/textures/items/miniheart_red.png and b/mods/tinker/textures/items/miniheart_red.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_aluminum.png b/mods/tinker/textures/items/oreberries/oreberry_aluminum.png index 3555483a..80993e88 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_aluminum.png and b/mods/tinker/textures/items/oreberries/oreberry_aluminum.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_copper.png b/mods/tinker/textures/items/oreberries/oreberry_copper.png index fb7904dc..aab963bb 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_copper.png and b/mods/tinker/textures/items/oreberries/oreberry_copper.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_gold.png b/mods/tinker/textures/items/oreberries/oreberry_gold.png index a703a49c..c6f39c35 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_gold.png and b/mods/tinker/textures/items/oreberries/oreberry_gold.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_iron.png b/mods/tinker/textures/items/oreberries/oreberry_iron.png index dd5e74ee..1b20f6e6 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_iron.png and b/mods/tinker/textures/items/oreberries/oreberry_iron.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_silver.png b/mods/tinker/textures/items/oreberries/oreberry_silver.png index 3169f759..098df935 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_silver.png and b/mods/tinker/textures/items/oreberries/oreberry_silver.png differ diff --git a/mods/tinker/textures/items/oreberries/oreberry_tin.png b/mods/tinker/textures/items/oreberries/oreberry_tin.png index d89c6299..c7bac25f 100644 Binary files a/mods/tinker/textures/items/oreberries/oreberry_tin.png and b/mods/tinker/textures/items/oreberries/oreberry_tin.png differ diff --git a/mods/tinker/textures/items/parts/alumite_hammer_head.png b/mods/tinker/textures/items/parts/alumite_hammer_head.png new file mode 100644 index 00000000..ad77dc66 Binary files /dev/null and b/mods/tinker/textures/items/parts/alumite_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/ardite_hammer_head.png b/mods/tinker/textures/items/parts/ardite_hammer_head.png new file mode 100644 index 00000000..bc4c1ab6 Binary files /dev/null and b/mods/tinker/textures/items/parts/ardite_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/blueslime_hammer_head.png b/mods/tinker/textures/items/parts/blueslime_hammer_head.png new file mode 100644 index 00000000..18f9bcf0 Binary files /dev/null and b/mods/tinker/textures/items/parts/blueslime_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/bone_hammer_head.png b/mods/tinker/textures/items/parts/bone_hammer_head.png new file mode 100644 index 00000000..5d41d1af Binary files /dev/null and b/mods/tinker/textures/items/parts/bone_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/bronze_hammer_head.png b/mods/tinker/textures/items/parts/bronze_hammer_head.png new file mode 100644 index 00000000..ead2c90f Binary files /dev/null and b/mods/tinker/textures/items/parts/bronze_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/cactus_hammer_head.png b/mods/tinker/textures/items/parts/cactus_hammer_head.png new file mode 100644 index 00000000..c057ee27 Binary files /dev/null and b/mods/tinker/textures/items/parts/cactus_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/cobalt_hammer_head.png b/mods/tinker/textures/items/parts/cobalt_hammer_head.png new file mode 100644 index 00000000..dead1bb5 Binary files /dev/null and b/mods/tinker/textures/items/parts/cobalt_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/copper_hammer_head.png b/mods/tinker/textures/items/parts/copper_hammer_head.png new file mode 100644 index 00000000..764fc7aa Binary files /dev/null and b/mods/tinker/textures/items/parts/copper_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/flint_hammer_head.png b/mods/tinker/textures/items/parts/flint_hammer_head.png new file mode 100644 index 00000000..477a168c Binary files /dev/null and b/mods/tinker/textures/items/parts/flint_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/iron_hammer_head.png b/mods/tinker/textures/items/parts/iron_hammer_head.png new file mode 100644 index 00000000..13854418 Binary files /dev/null and b/mods/tinker/textures/items/parts/iron_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/manyullyn_hammer_head.png b/mods/tinker/textures/items/parts/manyullyn_hammer_head.png new file mode 100644 index 00000000..22548ac6 Binary files /dev/null and b/mods/tinker/textures/items/parts/manyullyn_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/netherrack_hammer_head.png b/mods/tinker/textures/items/parts/netherrack_hammer_head.png new file mode 100644 index 00000000..1e1ec236 Binary files /dev/null and b/mods/tinker/textures/items/parts/netherrack_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/obsidian_hammer_head.png b/mods/tinker/textures/items/parts/obsidian_hammer_head.png new file mode 100644 index 00000000..033114f9 Binary files /dev/null and b/mods/tinker/textures/items/parts/obsidian_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/paper_hammer_head.png b/mods/tinker/textures/items/parts/paper_hammer_head.png new file mode 100644 index 00000000..d591e0d6 Binary files /dev/null and b/mods/tinker/textures/items/parts/paper_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/slime_hammer_head.png b/mods/tinker/textures/items/parts/slime_hammer_head.png new file mode 100644 index 00000000..6627226b Binary files /dev/null and b/mods/tinker/textures/items/parts/slime_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/steel_hammer_head.png b/mods/tinker/textures/items/parts/steel_hammer_head.png new file mode 100644 index 00000000..8f5b9642 Binary files /dev/null and b/mods/tinker/textures/items/parts/steel_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/stone_hammer_head.png b/mods/tinker/textures/items/parts/stone_hammer_head.png new file mode 100644 index 00000000..6f143074 Binary files /dev/null and b/mods/tinker/textures/items/parts/stone_hammer_head.png differ diff --git a/mods/tinker/textures/items/parts/wood_hammer_head.png b/mods/tinker/textures/items/parts/wood_hammer_head.png new file mode 100644 index 00000000..3fe2b48e Binary files /dev/null and b/mods/tinker/textures/items/parts/wood_hammer_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png index 8457e046..555eda0b 100644 Binary files a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png and b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_accessory.png differ diff --git a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png index 82a46fb6..2234e6c3 100644 Binary files a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png and b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_handle.png differ diff --git a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png index 2b640e43..afe316de 100644 Binary files a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png and b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png index ee73fb37..afe6ed61 100644 Binary files a/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png and b/mods/tinker/textures/items/pickaxe/alumite_pickaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png index d6becbb0..1e2ba2c4 100644 Binary files a/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png and b/mods/tinker/textures/items/pickaxe/ardite_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png index 8cdec1d3..4dedab1e 100644 Binary files a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_accessory.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png index 8231e9f2..56b68f54 100644 Binary files a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_handle.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png index a12236e3..a98db0be 100644 Binary files a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png index e2ae4fc6..bf369593 100644 Binary files a/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png and b/mods/tinker/textures/items/pickaxe/blueslime_pickaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png index 35eaf18b..b790c48f 100644 Binary files a/mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png and b/mods/tinker/textures/items/pickaxe/diamond_pickaxe_effect.png differ diff --git a/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png index e25b2b7e..156b777b 100644 Binary files a/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png and b/mods/tinker/textures/items/pickaxe/netherrack_pickaxe_accessory.png differ diff --git a/mods/tinker/textures/items/pickaxe/silk_pickaxe_effect.png b/mods/tinker/textures/items/pickaxe/silk_pickaxe_effect.png index 97976688..cae9dc62 100644 Binary files a/mods/tinker/textures/items/pickaxe/silk_pickaxe_effect.png and b/mods/tinker/textures/items/pickaxe/silk_pickaxe_effect.png differ diff --git a/mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png index 4b3d874f..b7bbe131 100644 Binary files a/mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png and b/mods/tinker/textures/items/pickaxe/steel_pickaxe_accessory.png differ diff --git a/mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png index 9aa6a648..3c574ca9 100644 Binary files a/mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png and b/mods/tinker/textures/items/pickaxe/steel_pickaxe_handle.png differ diff --git a/mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png index 2d19dd97..876bf735 100644 Binary files a/mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png and b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png index a170d8fa..ab382304 100644 Binary files a/mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png and b/mods/tinker/textures/items/pickaxe/steel_pickaxe_head_broken.png differ diff --git a/mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png b/mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png index b76cd8c0..3d1ff580 100644 Binary files a/mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png and b/mods/tinker/textures/items/pickaxe/stone_pickaxe_head.png differ diff --git a/mods/tinker/textures/items/potionlauncher.png b/mods/tinker/textures/items/potionlauncher.png index 789de1c4..5b3a1b14 100644 Binary files a/mods/tinker/textures/items/potionlauncher.png and b/mods/tinker/textures/items/potionlauncher.png differ diff --git a/mods/tinker/textures/items/rapier/alumite_rapier_accessory.png b/mods/tinker/textures/items/rapier/alumite_rapier_accessory.png index 7544de05..e22afe9e 100644 Binary files a/mods/tinker/textures/items/rapier/alumite_rapier_accessory.png and b/mods/tinker/textures/items/rapier/alumite_rapier_accessory.png differ diff --git a/mods/tinker/textures/items/rapier/alumite_rapier_blade.png b/mods/tinker/textures/items/rapier/alumite_rapier_blade.png index da6da9bb..9e43e729 100644 Binary files a/mods/tinker/textures/items/rapier/alumite_rapier_blade.png and b/mods/tinker/textures/items/rapier/alumite_rapier_blade.png differ diff --git a/mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png index 3a1a9279..06085140 100644 Binary files a/mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png and b/mods/tinker/textures/items/rapier/alumite_rapier_blade_broken.png differ diff --git a/mods/tinker/textures/items/rapier/alumite_rapier_handle.png b/mods/tinker/textures/items/rapier/alumite_rapier_handle.png index 5a00e300..0dfb04c2 100644 Binary files a/mods/tinker/textures/items/rapier/alumite_rapier_handle.png and b/mods/tinker/textures/items/rapier/alumite_rapier_handle.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png b/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png index 96f00258..a3f72184 100644 Binary files a/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png and b/mods/tinker/textures/items/rapier/blueslime_rapier_accessory.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png b/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png index cd0e064e..bac98fd8 100644 Binary files a/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png and b/mods/tinker/textures/items/rapier/blueslime_rapier_blade.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png index 6a447135..84df8263 100644 Binary files a/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png and b/mods/tinker/textures/items/rapier/blueslime_rapier_blade_broken.png differ diff --git a/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png b/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png index 3a1e25b6..9585a231 100644 Binary files a/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png and b/mods/tinker/textures/items/rapier/blueslime_rapier_handle.png differ diff --git a/mods/tinker/textures/items/rapier/quartz_rapier_effect.png b/mods/tinker/textures/items/rapier/quartz_rapier_effect.png index 6dda46ee..8479758a 100644 Binary files a/mods/tinker/textures/items/rapier/quartz_rapier_effect.png and b/mods/tinker/textures/items/rapier/quartz_rapier_effect.png differ diff --git a/mods/tinker/textures/items/rapier/silk_rapier_effect.png b/mods/tinker/textures/items/rapier/silk_rapier_effect.png index ec3ce12f..79352aa4 100644 Binary files a/mods/tinker/textures/items/rapier/silk_rapier_effect.png and b/mods/tinker/textures/items/rapier/silk_rapier_effect.png differ diff --git a/mods/tinker/textures/items/rapier/steel_rapier_accessory.png b/mods/tinker/textures/items/rapier/steel_rapier_accessory.png index 723be388..7213d5f3 100644 Binary files a/mods/tinker/textures/items/rapier/steel_rapier_accessory.png and b/mods/tinker/textures/items/rapier/steel_rapier_accessory.png differ diff --git a/mods/tinker/textures/items/rapier/steel_rapier_blade.png b/mods/tinker/textures/items/rapier/steel_rapier_blade.png index 70f4ae64..bcd0e558 100644 Binary files a/mods/tinker/textures/items/rapier/steel_rapier_blade.png and b/mods/tinker/textures/items/rapier/steel_rapier_blade.png differ diff --git a/mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png b/mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png index 839e77a3..d3158512 100644 Binary files a/mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png and b/mods/tinker/textures/items/rapier/steel_rapier_blade_broken.png differ diff --git a/mods/tinker/textures/items/rapier/steel_rapier_handle.png b/mods/tinker/textures/items/rapier/steel_rapier_handle.png index 1eec01cc..01d769b1 100644 Binary files a/mods/tinker/textures/items/rapier/steel_rapier_handle.png and b/mods/tinker/textures/items/rapier/steel_rapier_handle.png differ diff --git a/mods/tinker/textures/items/redstoneball.png b/mods/tinker/textures/items/redstoneball.png index fba70ec5..8d5e1a67 100644 Binary files a/mods/tinker/textures/items/redstoneball.png and b/mods/tinker/textures/items/redstoneball.png differ diff --git a/mods/tinker/textures/items/scythe/blueslime_scythe_head.png b/mods/tinker/textures/items/scythe/blueslime_scythe_head.png index 20c081df..3fe25d97 100644 Binary files a/mods/tinker/textures/items/scythe/blueslime_scythe_head.png and b/mods/tinker/textures/items/scythe/blueslime_scythe_head.png differ diff --git a/mods/tinker/textures/items/scythe/blueslime_scythe_head_broken.png b/mods/tinker/textures/items/scythe/blueslime_scythe_head_broken.png index 2768becc..ae167f84 100644 Binary files a/mods/tinker/textures/items/scythe/blueslime_scythe_head_broken.png and b/mods/tinker/textures/items/scythe/blueslime_scythe_head_broken.png differ diff --git a/mods/tinker/textures/items/scythe/quartz_scythe_effect.png b/mods/tinker/textures/items/scythe/quartz_scythe_effect.png index ffaae684..143bf663 100644 Binary files a/mods/tinker/textures/items/scythe/quartz_scythe_effect.png and b/mods/tinker/textures/items/scythe/quartz_scythe_effect.png differ diff --git a/mods/tinker/textures/items/scythe/steel_scythe_head.png b/mods/tinker/textures/items/scythe/steel_scythe_head.png index 50659773..aab95cd9 100644 Binary files a/mods/tinker/textures/items/scythe/steel_scythe_head.png and b/mods/tinker/textures/items/scythe/steel_scythe_head.png differ diff --git a/mods/tinker/textures/items/scythe/steel_scythe_head_broken.png b/mods/tinker/textures/items/scythe/steel_scythe_head_broken.png index 6e3c6a60..b503d409 100644 Binary files a/mods/tinker/textures/items/scythe/steel_scythe_head_broken.png and b/mods/tinker/textures/items/scythe/steel_scythe_head_broken.png differ diff --git a/mods/tinker/textures/items/scythe/stone_scythe_handle.png b/mods/tinker/textures/items/scythe/stone_scythe_handle.png index 936806a7..110c5c26 100644 Binary files a/mods/tinker/textures/items/scythe/stone_scythe_handle.png and b/mods/tinker/textures/items/scythe/stone_scythe_handle.png differ diff --git a/mods/tinker/textures/items/stonearmorstand.png b/mods/tinker/textures/items/stonearmorstand.png index 5d5297f1..9dc4428a 100644 Binary files a/mods/tinker/textures/items/stonearmorstand.png and b/mods/tinker/textures/items/stonearmorstand.png differ diff --git a/mods/tinker/textures/items/tinkerbook_blue.png b/mods/tinker/textures/items/tinkerbook_blue.png index 8e11fa59..cbe019a2 100644 Binary files a/mods/tinker/textures/items/tinkerbook_blue.png and b/mods/tinker/textures/items/tinkerbook_blue.png differ diff --git a/mods/tinker/textures/items/tinkerbook_green.png b/mods/tinker/textures/items/tinkerbook_green.png index f443991f..cd1ffd39 100644 Binary files a/mods/tinker/textures/items/tinkerbook_green.png and b/mods/tinker/textures/items/tinkerbook_green.png differ diff --git a/mods/tinker/textures/items/tinkerbook_smeltery.png b/mods/tinker/textures/items/tinkerbook_smeltery.png index c820b229..cd958904 100644 Binary files a/mods/tinker/textures/items/tinkerbook_smeltery.png and b/mods/tinker/textures/items/tinkerbook_smeltery.png differ diff --git a/mods/tinker/textures/items/tinkerbook_toolstation.png b/mods/tinker/textures/items/tinkerbook_toolstation.png index 1668cd5d..35420beb 100644 Binary files a/mods/tinker/textures/items/tinkerbook_toolstation.png and b/mods/tinker/textures/items/tinkerbook_toolstation.png differ diff --git a/mods/tinker/textures/items/tparts.png b/mods/tinker/textures/items/tparts.png index 8c67a7a4..40bb221c 100644 Binary files a/mods/tinker/textures/items/tparts.png and b/mods/tinker/textures/items/tparts.png differ diff --git a/mods/tinker/textures/mob/Automaton.png b/mods/tinker/textures/mob/Automaton.png deleted file mode 100644 index 2d081e5a..00000000 Binary files a/mods/tinker/textures/mob/Automaton.png and /dev/null differ diff --git a/mods/tinker/textures/mob/armorstandtexture.png b/mods/tinker/textures/mob/armorstandtexture.png index 29812668..e9efb1f2 100644 Binary files a/mods/tinker/textures/mob/armorstandtexture.png and b/mods/tinker/textures/mob/armorstandtexture.png differ diff --git a/mods/tinker/textures/mob/crystalwater.png b/mods/tinker/textures/mob/crystalwater.png index fe6be356..f4c9d459 100644 Binary files a/mods/tinker/textures/mob/crystalwater.png and b/mods/tinker/textures/mob/crystalwater.png differ diff --git a/mods/tinker/textures/mob/skyla.png b/mods/tinker/textures/mob/skyla.png index 978f3fd0..258098d8 100644 Binary files a/mods/tinker/textures/mob/skyla.png and b/mods/tinker/textures/mob/skyla.png differ diff --git a/mods/tinker/textures/mob/slimeedible.png b/mods/tinker/textures/mob/slimeedible.png index 1357ad1e..7ab2c6fe 100644 Binary files a/mods/tinker/textures/mob/slimeedible.png and b/mods/tinker/textures/mob/slimeedible.png differ diff --git a/mods/tinker/textures/mob/slimemetal.png b/mods/tinker/textures/mob/slimemetal.png index 30a1d6f6..3d721ab0 100644 Binary files a/mods/tinker/textures/mob/slimemetal.png and b/mods/tinker/textures/mob/slimemetal.png differ diff --git a/mods/tinker/textures/mob/villagertools.png b/mods/tinker/textures/mob/villagertools.png index cdf36ccb..8101b61f 100644 Binary files a/mods/tinker/textures/mob/villagertools.png and b/mods/tinker/textures/mob/villagertools.png differ diff --git a/mods/tinker/textures/skill/Float48x.png b/mods/tinker/textures/skill/Float48x.png index 5061c90d..37cc41c7 100644 Binary files a/mods/tinker/textures/skill/Float48x.png and b/mods/tinker/textures/skill/Float48x.png differ diff --git a/mods/tinker/textures/skill/Jump48x.png b/mods/tinker/textures/skill/Jump48x.png index ee525031..ae2caadc 100644 Binary files a/mods/tinker/textures/skill/Jump48x.png and b/mods/tinker/textures/skill/Jump48x.png differ diff --git a/mods/tinker/textures/skill/Wall16x.png b/mods/tinker/textures/skill/Wall16x.png index 48ddf36e..31b39ecf 100644 Binary files a/mods/tinker/textures/skill/Wall16x.png and b/mods/tinker/textures/skill/Wall16x.png differ diff --git a/mods/tinker/textures/skill/Wall32x.png b/mods/tinker/textures/skill/Wall32x.png index c2edeaab..2ea15be2 100644 Binary files a/mods/tinker/textures/skill/Wall32x.png and b/mods/tinker/textures/skill/Wall32x.png differ diff --git a/mods/tinker/textures/skill/Wall48x.png b/mods/tinker/textures/skill/Wall48x.png index 81a6f2ee..ba3ce08c 100644 Binary files a/mods/tinker/textures/skill/Wall48x.png and b/mods/tinker/textures/skill/Wall48x.png differ diff --git a/mods/tinker/textures/util/font.png b/mods/tinker/textures/util/font.png index fb367c96..b46d410b 100644 Binary files a/mods/tinker/textures/util/font.png and b/mods/tinker/textures/util/font.png differ diff --git a/spritesheets/battleaxe.png b/spritesheets/battleaxe.png new file mode 100644 index 00000000..a1da2dc8 Binary files /dev/null and b/spritesheets/battleaxe.png differ diff --git a/spritesheets/battleaxe.txt b/spritesheets/battleaxe.txt new file mode 100644 index 00000000..a59035ec --- /dev/null +++ b/spritesheets/battleaxe.txt @@ -0,0 +1,102 @@ +0,0 - wood_battleaxe_handle +1,0 - stone_battleaxe_handle +2,0 - iron_battleaxe_handle +3,0 - flint_battleaxe_handle +4,0 - cactus_battleaxe_handle +5,0 - bone_battleaxe_handle +6,0 - obsidian_battleaxe_handle +7,0 - netherrack_battleaxe_handle +8,0 - slime_battleaxe_handle +9,0 - paper_battleaxe_handle +10,0 - cobalt_battleaxe_handle +11,0 - ardite_battleaxe_handle +12,0 - manyullyn_battleaxe_handle +13,0 - copper_battleaxe_handle +14,0 - bronze_battleaxe_handle +15,0 - alumite_battleaxe_handle +0,1 - blueslime_battleaxe_handle +1,1 - steel_battleaxe_handle +0,2 - wood_battleaxe_fronthead +1,2 - stone_battleaxe_fronthead +2,2 - iron_battleaxe_fronthead +3,2 - flint_battleaxe_fronthead +4,2 - cactus_battleaxe_fronthead +5,2 - bone_battleaxe_fronthead +6,2 - obsidian_battleaxe_fronthead +7,2 - netherrack_battleaxe_fronthead +8,2 - slime_battleaxe_fronthead +9,2 - paper_battleaxe_fronthead +10,2 - cobalt_battleaxe_fronthead +11,2 - ardite_battleaxe_fronthead +12,2 - manyullyn_battleaxe_fronthead +13,2 - copper_battleaxe_fronthead +14,2 - bronze_battleaxe_fronthead +15,2 - alumite_battleaxe_fronthead +0,3 - blueslime_battleaxe_fronthead +1,3 - steel_battleaxe_fronthead +0,4 - wood_battleaxe_backhead +1,4 - stone_battleaxe_backhead +2,4 - iron_battleaxe_backhead +3,4 - flint_battleaxe_backhead +4,4 - cactus_battleaxe_backhead +5,4 - bone_battleaxe_backhead +6,4 - obsidian_battleaxe_backhead +7,4 - netherrack_battleaxe_backhead +8,4 - slime_battleaxe_backhead +9,4 - paper_battleaxe_backhead +10,4 - cobalt_battleaxe_backhead +11,4 - ardite_battleaxe_backhead +12,4 - manyullyn_battleaxe_backhead +13,4 - copper_battleaxe_backhead +14,4 - bronze_battleaxe_backhead +15,4 - alumite_battleaxe_backhead +0,5 - blueslime_battleaxe_backhead +1,5 - steel_battleaxe_backhead +0,6 - wood_battleaxe_binding +1,6 - stone_battleaxe_binding +2,6 - iron_battleaxe_binding +3,6 - flint_battleaxe_binding +4,6 - cactus_battleaxe_binding +5,6 - bone_battleaxe_binding +6,6 - obsidian_battleaxe_binding +7,6 - netherrack_battleaxe_binding +8,6 - slime_battleaxe_binding +9,6 - paper_battleaxe_binding +10,6 - cobalt_battleaxe_binding +11,6 - ardite_battleaxe_binding +12,6 - manyullyn_battleaxe_binding +13,6 - copper_battleaxe_binding +14,6 - bronze_battleaxe_binding +15,6 - alumite_battleaxe_binding +0,7 - blueslime_battleaxe_binding +1,7 - steel_battleaxe_binding +0,12 - wood_battleaxe_fronthead_broken +1,12 - stone_battleaxe_fronthead_broken +2,12 - iron_battleaxe_fronthead_broken +3,12 - flint_battleaxe_fronthead_broken +4,12 - cactus_battleaxe_fronthead_broken +5,12 - bone_battleaxe_fronthead_broken +6,12 - obsidian_battleaxe_fronthead_broken +7,12 - netherrack_battleaxe_fronthead_broken +8,12 - slime_battleaxe_fronthead_broken +9,12 - paper_battleaxe_fronthead_broken +10,12 - cobalt_battleaxe_fronthead_broken +11,12 - ardite_battleaxe_fronthead_broken +12,12 - manyullyn_battleaxe_fronthead_broken +13,12 - copper_battleaxe_fronthead_broken +14,12 - bronze_battleaxe_fronthead_broken +15,12 - alumite_battleaxe_fronthead_broken +0,13 - blueslime_battleaxe_fronthead_broken +1,13 - steel_battleaxe_fronthead_broken +0,14 - diamond_battleaxe_effect +1,14 - emerald_battleaxe_effect +2,14 - redstone_battleaxe_effect +4,14 - moss_battleaxe_effect +5,14 - ice_battleaxe_effect +6,14 - lava_battleaxe_effect +7,14 - blaze_battleaxe_effect +8,14 - necrotic_battleaxe_effect +9,14 - electric_battleaxe_effect +10,14 - lapis_battleaxe_effect +11,14 - silk_battleaxe_effect +12,14 - quartz_battleaxe_effect \ No newline at end of file diff --git a/spritesheets/giantblade.png b/spritesheets/giantblade.png index de720222..faf517f1 100644 Binary files a/spritesheets/giantblade.png and b/spritesheets/giantblade.png differ diff --git a/spritesheets/hammer.png b/spritesheets/hammer.png new file mode 100644 index 00000000..ec7d7fb1 Binary files /dev/null and b/spritesheets/hammer.png differ diff --git a/spritesheets/hammer.txt b/spritesheets/hammer.txt new file mode 100644 index 00000000..8a774510 --- /dev/null +++ b/spritesheets/hammer.txt @@ -0,0 +1,102 @@ +0,0 - wood_hammer_handle +1,0 - stone_hammer_handle +2,0 - iron_hammer_handle +3,0 - flint_hammer_handle +4,0 - cactus_hammer_handle +5,0 - bone_hammer_handle +6,0 - obsidian_hammer_handle +7,0 - netherrack_hammer_handle +8,0 - slime_hammer_handle +9,0 - paper_hammer_handle +10,0 - cobalt_hammer_handle +11,0 - ardite_hammer_handle +12,0 - manyullyn_hammer_handle +13,0 - copper_hammer_handle +14,0 - bronze_hammer_handle +15,0 - alumite_hammer_handle +0,1 - blueslime_hammer_handle +1,1 - steel_hammer_handle +0,2 - wood_hammer_front +1,2 - stone_hammer_front +2,2 - iron_hammer_front +3,2 - flint_hammer_front +4,2 - cactus_hammer_front +5,2 - bone_hammer_front +6,2 - obsidian_hammer_front +7,2 - netherrack_hammer_front +8,2 - slime_hammer_front +9,2 - paper_hammer_front +10,2 - cobalt_hammer_front +11,2 - ardite_hammer_front +12,2 - manyullyn_hammer_front +13,2 - copper_hammer_front +14,2 - bronze_hammer_front +15,2 - alumite_hammer_front +0,3 - blueslime_hammer_front +1,3 - steel_hammer_front +0,4 - wood_hammer_head +1,4 - stone_hammer_head +2,4 - iron_hammer_head +3,4 - flint_hammer_head +4,4 - cactus_hammer_head +5,4 - bone_hammer_head +6,4 - obsidian_hammer_head +7,4 - netherrack_hammer_head +8,4 - slime_hammer_head +9,4 - paper_hammer_head +10,4 - cobalt_hammer_head +11,4 - ardite_hammer_head +12,4 - manyullyn_hammer_head +13,4 - copper_hammer_head +14,4 - bronze_hammer_head +15,4 - alumite_hammer_head +0,5 - blueslime_hammer_head +1,5 - steel_hammer_head +0,6 - wood_hammer_back +1,6 - stone_hammer_back +2,6 - iron_hammer_back +3,6 - flint_hammer_back +4,6 - cactus_hammer_back +5,6 - bone_hammer_back +6,6 - obsidian_hammer_back +7,6 - netherrack_hammer_back +8,6 - slime_hammer_back +9,6 - paper_hammer_back +10,6 - cobalt_hammer_back +11,6 - ardite_hammer_back +12,6 - manyullyn_hammer_back +13,6 - copper_hammer_back +14,6 - bronze_hammer_back +15,6 - alumite_hammer_back +0,7 - blueslime_hammer_back +1,7 - steel_hammer_back +0,12 - wood_hammer_handle_broken +1,12 - stone_hammer_handle_broken +2,12 - iron_hammer_handle_broken +3,12 - flint_hammer_handle_broken +4,12 - cactus_hammer_handle_broken +5,12 - bone_hammer_handle_broken +6,12 - obsidian_hammer_handle_broken +7,12 - netherrack_hammer_handle_broken +8,12 - slime_hammer_handle_broken +9,12 - paper_hammer_handle_broken +10,12 - cobalt_hammer_handle_broken +11,12 - ardite_hammer_handle_broken +12,12 - manyullyn_hammer_handle_broken +13,12 - copper_hammer_handle_broken +14,12 - bronze_hammer_handle_broken +15,12 - alumite_hammer_handle_broken +0,13 - blueslime_hammer_handle_broken +1,13 - steel_hammer_handle_broken +0,14 - diamond_hammer_effect +1,14 - emerald_hammer_effect +2,14 - redstone_hammer_effect +4,14 - moss_hammer_effect +5,14 - ice_hammer_effect +6,14 - lava_hammer_effect +7,14 - blaze_hammer_effect +8,14 - necrotic_hammer_effect +9,14 - electric_hammer_effect +10,14 - lapis_hammer_effect +11,14 - silk_hammer_effect +12,14 - quartz_hammer_effect \ No newline at end of file