diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index 747aaae76..3c0da19e2 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -24,14 +24,14 @@ public class CustomItems { public static Item wand; public static Item cloner; public static Item scripter; - public static Item moving; - public static Item mount; + public static Item moving; + public static Item mount; public static Item teleporter; public static Item scripted_item; public static Item soulstoneEmpty; - public static Item soulstoneFull; - + public static Item soulstoneFull; + public static Item banjo; public static Item violin; public static Item violinbow; @@ -136,13 +136,13 @@ public class CustomItems { public static Item staffElemental; public static Item orb; public static Item mana; - + public static Item swordBronze; public static Item swordEmerald; public static Item swordDemonic; public static Item swordFrost; public static Item swordMithril; - + public static Item bronze_ingot; public static Item demonic_ingot; public static Item mithril_ingot; @@ -154,13 +154,13 @@ public class CustomItems { public static Item letter; public static Item bag; public static Item satchel; - + public static Block redstoneBlock; public static Block carpentyBench; public static Block mailbox; public static Block waypoint; public static Block border; - + public static Block banner; public static Block wallBanner; public static Block tallLamp; @@ -190,7 +190,7 @@ public class CustomItems { public static Block campfire_unlit; public static Block candle_unlit; public static Block scripted; - + public static Item crossbowBolt; public static CreativeTabNpcs tab = new CreativeTabNpcs("cnpcs"); @@ -199,14 +199,14 @@ public class CustomItems { public static CreativeTabNpcs tabBlocks = new CreativeTabNpcs("cnpcsb"); public static CreativeTabNpcs tabMisc = new CreativeTabNpcs("cnpcsm"); - public static void load(){ + public static void load(){ GameRegistry.registerTileEntity(TileRedstoneBlock.class, "TileRedstoneBlock"); GameRegistry.registerTileEntity(TileBlockAnvil.class, "TileBlockAnvil"); GameRegistry.registerTileEntity(TileMailbox.class, "TileMailbox"); GameRegistry.registerTileEntity(TileWaypoint.class, "TileWaypoint"); GameRegistry.registerTileEntity(TileBanner.class, "TileNPCBanner"); GameRegistry.registerTileEntity(TileScripted.class, "TileNPCScripted"); - + if(!ConfigMain.DisableExtraBlock){ GameRegistry.registerTileEntity(TileWallBanner.class, "TileNPCWallBanner"); GameRegistry.registerTileEntity(TileTallLamp.class, "TileNPCTallLamp"); @@ -237,7 +237,7 @@ public class CustomItems { mount = new ItemMounter().setUnlocalizedName("npcMounter").setFull3D(); teleporter = new ItemTeleporter().setUnlocalizedName("npcTeleporter").setFull3D(); scripted_item = new ItemScripted().setUnlocalizedName("scripted_item").setFull3D(); - + redstoneBlock = new BlockNpcRedstone().setHardness(50.0F).setResistance(2000).setBlockName("npcRedstoneBlock").setBlockTextureName("customnpcs:npcRedstoneBlock").setCreativeTab(tab); carpentyBench = new BlockCarpentryBench().setBlockName("npcCarpentyBench").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); mailbox = new BlockMailbox().setBlockName("npcMailbox").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(tabBlocks); @@ -269,9 +269,9 @@ public class CustomItems { Item.getItemFromBlock(mailbox).setHasSubtypes(true); Item.getItemFromBlock(carpentyBench).setHasSubtypes(true); - + ((ItemNpcBlock)Item.getItemFromBlock(carpentyBench)).names = new String[]{"tile.npcCarpentyBench", "tile.anvil"}; - + if(!ConfigMain.DisableExtraBlock){ blood = new BlockBlood().setBlockName("npcBloodBlock").setBlockTextureName("customnpcs:npcBloodBlock").setCreativeTab(tabBlocks); banner = new BlockBanner().setBlockName("npcBanner").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(tabBlocks); @@ -297,7 +297,7 @@ public class CustomItems { book = new BlockBook().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); pedestal = new BlockPedestal().setBlockName("npcPedestal").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood).setCreativeTab(tabBlocks); crystal = new BlockCrystal().setBlockName("npcCrystal").setBlockTextureName("customnpcs:npcCrystal").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeGlass).setCreativeTab(tabBlocks); - + campfire_unlit = new BlockCampfire(false).setBlockName("npcCampfire").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); lamp_unlit = new BlockLamp(false).setBlockName("npcLamp").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood); candle_unlit = new BlockCandle(false).setBlockName("npcCandle").setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeWood); @@ -307,17 +307,17 @@ public class CustomItems { GameRegistry.registerBlock(wallBanner, ItemBlock.class, "npcWallBanner"); GameRegistry.registerBlock(tallLamp, ItemBlock.class, "npcTallLamp"); GameRegistry.registerBlock(chair, ItemBlock.class, "npcChair"); - GameRegistry.registerBlock(crate, ItemBlock.class, "npcCrate"); - GameRegistry.registerBlock(weaponsRack, ItemBlock.class, "npcWeaponRack"); - GameRegistry.registerBlock(couchWool, ItemBlock.class, "npcCouchWool"); - GameRegistry.registerBlock(couchWood, ItemBlock.class, "npcCouchWood"); - GameRegistry.registerBlock(table, ItemBlock.class, "npcTable"); - GameRegistry.registerBlock(stool, ItemBlock.class, "npcStool"); - GameRegistry.registerBlock(placeholder, ItemPlaceholder.class, "npcPlaceholder"); + GameRegistry.registerBlock(crate, ItemBlock.class, "npcCrate"); + GameRegistry.registerBlock(weaponsRack, ItemBlock.class, "npcWeaponRack"); + GameRegistry.registerBlock(couchWool, ItemBlock.class, "npcCouchWool"); + GameRegistry.registerBlock(couchWood, ItemBlock.class, "npcCouchWood"); + GameRegistry.registerBlock(table, ItemBlock.class, "npcTable"); + GameRegistry.registerBlock(stool, ItemBlock.class, "npcStool"); + GameRegistry.registerBlock(placeholder, ItemPlaceholder.class, "npcPlaceholder"); GameRegistry.registerBlock(bigsign, "npcBigSign"); - GameRegistry.registerBlock(barrel, ItemBlock.class, "npcBarrel"); - GameRegistry.registerBlock(tombstone, ItemBlock.class, "npcTombstone"); - GameRegistry.registerBlock(shelf, ItemBlock.class, "npcShelf"); + GameRegistry.registerBlock(barrel, ItemBlock.class, "npcBarrel"); + GameRegistry.registerBlock(tombstone, ItemBlock.class, "npcTombstone"); + GameRegistry.registerBlock(shelf, ItemBlock.class, "npcShelf"); GameRegistry.registerBlock(sign, ItemBlock.class, "npcSign"); GameRegistry.registerBlock(beam, ItemBlock.class, "npcBeam"); GameRegistry.registerBlock(book, "npcBook"); @@ -352,49 +352,49 @@ public class CustomItems { } banjo = new ItemMusicBanjo().setUnlocalizedName("npcBanjo").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBanjo"); - violin = new ItemMusicViolin().setUnlocalizedName("npcViolin").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcViolin"); + violin = new ItemMusicViolin().setUnlocalizedName("npcViolin").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcViolin"); violinbow = new ItemNpcInterface().setUnlocalizedName("npcViolinBow").setFull3D().setMaxStackSize(1).setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcViolinBow"); harp = new ItemMusicViolin().setUnlocalizedName("npcHarp").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcHarp"); guitar = new ItemMusicBanjo().setUnlocalizedName("npcGuitar").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcGuitar"); frenchHorn = new ItemMusic().setRotated().setUnlocalizedName("npcFrenchHorn").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrenchHorn"); ocarina = new ItemMusicOracina().setUnlocalizedName("npcOcarina").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcOcarina"); clarinet = new ItemMusicClarinet().setUnlocalizedName("npcClarinet").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcClarinet"); - - + + if(!ConfigMain.DisableExtraItems){ tabArmor = new CreativeTabNpcs("cnpcsa"); tabWeapon = new CreativeTabNpcs("cnpcsw"); - + gunWood = new ItemGun(26820,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcWoodenGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenGun"); bulletWood = new ItemBullet(26821,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcWoodenBullet").setMaxStackSize(64).setTextureName("customnpcs:npcWoodenBullet"); - + gunStone = new ItemGun(26822,EnumNpcToolMaterial.STONE).setUnlocalizedName("npcStoneGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneGun"); bulletStone = new ItemBullet(26823,EnumNpcToolMaterial.STONE).setUnlocalizedName("npcStoneBullet").setMaxStackSize(64).setTextureName("customnpcs:npcStoneBullet"); - + gunIron = new ItemGun(26824,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcIronGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronGun"); bulletIron = new ItemBullet(26825,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcIronBullet").setMaxStackSize(64).setTextureName("customnpcs:npcIronBullet"); - + gunGold = new ItemGun(26826,EnumNpcToolMaterial.GOLD).setUnlocalizedName("npcGoldGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcGoldGun"); bulletGold = new ItemBullet(26827,EnumNpcToolMaterial.GOLD).setUnlocalizedName("npcGoldenBullet").setMaxStackSize(64).setTextureName("customnpcs:npcGoldenBullet"); - + gunDiamond = new ItemGun(26828,EnumNpcToolMaterial.DIA).setUnlocalizedName("npcDiamondGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDiamondGun"); bulletDiamond = new ItemBullet(26829,EnumNpcToolMaterial.DIA).setUnlocalizedName("npcDiamondBullet").setMaxStackSize(64).setTextureName("customnpcs:npcDiamondBullet"); - + gunBronze = new ItemGun(26830,EnumNpcToolMaterial.BRONZE).setUnlocalizedName("npcBronzeGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBronzeGun"); bulletBronze = new ItemBullet(26831,EnumNpcToolMaterial.BRONZE).setUnlocalizedName("npcBronzeBullet").setMaxStackSize(64).setTextureName("customnpcs:npcBronzeBullet"); - + gunEmerald = new ItemGun(26832,EnumNpcToolMaterial.EMERALD).setUnlocalizedName("npcEmeraldGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcEmeraldGun"); bulletEmerald = new ItemBullet(26833,EnumNpcToolMaterial.EMERALD).setUnlocalizedName("npcEmeraldBullet").setMaxStackSize(64).setTextureName("customnpcs:npcEmeraldBullet"); - + gunMachine = new ItemMachineGun(26834).setUnlocalizedName("npcMachineGun").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMachineGun"); bulletBlack = new ItemBullet(26835,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcBlackBullet").setMaxStackSize(64).setTextureName("customnpcs:npcBlackBullet"); - + ToolMaterial bronze = EnumHelper.addToolMaterial("BRONZE", 2, 170, 5.0F, 2, 15); ToolMaterial emerald = EnumHelper.addToolMaterial("REALEMERALD", 3, 1000, 8.0F, 4, 10); ToolMaterial demonic = EnumHelper.addToolMaterial("DEMONIC", 3, 100, 8.0F, 6, 22); ToolMaterial frost = EnumHelper.addToolMaterial("FROST", 2, 59, 6.0F, 3, 5); ToolMaterial mithril = EnumHelper.addToolMaterial("MITHRIL", 3, 3000, 8.0F, 3.0F, 10); - + tridentWood = new ItemSpear(26840,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenTrident"); tridentStone = new ItemSpear(26841,ToolMaterial.STONE).setUnlocalizedName("npcStoneTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneTrident"); tridentIron = new ItemSpear(26842,ToolMaterial.IRON).setUnlocalizedName("npcIronTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronTrident"); @@ -406,7 +406,7 @@ public class CustomItems { tridentDemonic = new ItemSpear(26847,demonic).setUnlocalizedName("npcDemonicTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicTrident"); tridentFrost = new ItemSpear(26847,frost).setUnlocalizedName("npcFrostTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostTrident"); tridentMithril = new ItemSpear(26847,mithril).setUnlocalizedName("npcMithrilTrident").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilTrident"); - + spellNature = new ItemNpcInterface(26930).setUnlocalizedName("npcNatureSpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcNatureSpell"); spellArcane = new ItemNpcInterface(26931).setUnlocalizedName("npcArcaneSpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcArcaneSpell"); spellLightning = new ItemNpcInterface(26932).setUnlocalizedName("npcLightningSpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcLightningSpell"); @@ -414,24 +414,24 @@ public class CustomItems { spellFire = new ItemNpcInterface(26934).setUnlocalizedName("npcFireSpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcFireSpell"); spellDark = new ItemNpcInterface(26935).setUnlocalizedName("npcDarkSpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcDarkSpell"); spellHoly = new ItemNpcInterface(26936).setUnlocalizedName("npcHolySpell").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcHolySpell"); - + orb = new ItemOrb(26937).setUnlocalizedName("npcOrb").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcOrb"); mana = new ItemNpcInterface(26938).setUnlocalizedName("npcMana").setCreativeTab(CustomItems.tabWeapon).setTextureName("customnpcs:npcMana"); Item brokenOrb = new ItemOrb(26939).setUnlocalizedName("npcBrokenOrb").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBrokenOrb"); - + kunai = new ItemKunai(26910,ToolMaterial.IRON).setUnlocalizedName("npcKunai").setMaxStackSize(1).setFull3D().setTextureName("customnpcs:npcKunai"); Item kunai = new ItemKunaiReversed(26911,ToolMaterial.IRON).setUnlocalizedName("npcReverseKunai").setMaxStackSize(1).setFull3D().setTextureName("customnpcs:npcReverseKunai"); kunai = new ItemThrowingShuriken(26912).setRotating().setDropItem().setUnlocalizedName("npcShuriken").setFull3D().setTextureName("customnpcs:npcShuriken"); shuriken = new ItemThrowingWeapon(26913).setDamage(4).setRotating().setDropItem().setUnlocalizedName("npcGiantShuriken").setFull3D().setTextureName("customnpcs:npcGiantShuriken"); Item katana = new ItemNpcWeaponInterface(26914,ToolMaterial.IRON).setUnlocalizedName("npcKatana").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcKatana"); - Item knive = new ItemDagger(26915,ToolMaterial.IRON).setUnlocalizedName("npcKukri").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcKukri"); - + Item knive = new ItemNpcWeaponInterface(26915,ToolMaterial.IRON).setUnlocalizedName("npcKukri").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcKukri"); + swordBronze = new ItemNpcWeaponInterface(bronze).setUnlocalizedName("npcBronzeSword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBronzeSword"); swordEmerald = new ItemNpcWeaponInterface(emerald).setUnlocalizedName("npcEmeraldSword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcEmeraldSword"); swordDemonic = new ItemNpcWeaponInterface(demonic).setUnlocalizedName("npcDemonicSword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicSword"); swordFrost = new ItemNpcWeaponInterface(frost).setUnlocalizedName("npcFrostSword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostSword"); swordMithril = new ItemNpcWeaponInterface(mithril).setUnlocalizedName("npcMithrilSword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilSword"); - + Item golf = new ItemSpear(26800,ToolMaterial.IRON).setUnlocalizedName("npcGolfClub").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcGolfClub"); Item magicwand = new ItemWand(26801).setUnlocalizedName("npcMagicWand").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMagicWand"); Item chickenSword = new ItemNpcInterface(26802).setUnlocalizedName("npcChickenSword").setFull3D().setMaxStackSize(1).setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcChickenSword"); @@ -452,10 +452,10 @@ public class CustomItems { Item slingshot = new ItemSlingshot(26767).setUnlocalizedName("npcSlingshot").setFull3D().setTextureName("customnpcs:npcSlingshot"); Item musket = new ItemMusket(26758).setUnlocalizedName("npcMusket").setFull3D().setTextureName("customnpcs:npcMusket").setMaxStackSize(1); Item leaf = new ItemLeafBlade(26758,ToolMaterial.IRON).setUnlocalizedName("npcLeafBlade").setFull3D().setTextureName("customnpcs:npcLeafBlade").setMaxStackSize(1); - + Item crossbow = new ItemCrossbow(26768).setUnlocalizedName("npcCrossbow").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcCrossbow"); crossbowBolt = new ItemBullet(26769,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcCrossBolt").setMaxStackSize(64).setTextureName("customnpcs:npcCrossBolt"); - + Item batton = new ItemNpcWeaponInterface(26814,ToolMaterial.STONE).setUnlocalizedName("npcBatton").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBatton"); Item chainsaw = new ItemGunChainsaw(26815,ToolMaterial.EMERALD).setUnlocalizedName("npcGunChainsaw").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcGunChainsaw"); Item rapier = new ItemNpcWeaponInterface(26816,ToolMaterial.IRON).setUnlocalizedName("npcRapier").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcRapier"); @@ -464,7 +464,7 @@ public class CustomItems { Item swiss = new ItemDagger(26819,ToolMaterial.IRON).setUnlocalizedName("npcSwissArmyKnife").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcSwissArmyKnife"); Item wrench = new ItemNpcWeaponInterface(26836,ToolMaterial.IRON).setUnlocalizedName("npcWrench").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWrench"); excalibur = new ItemExcalibur(26799,ToolMaterial.EMERALD).setUnlocalizedName("npcExcalibur").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcExcalibur"); - + Item shield = new ItemShield(26729,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcWoodenShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenShield"); shield = new ItemShield(26730,EnumNpcToolMaterial.STONE).setUnlocalizedName("npcStoneShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneShield"); shield = new ItemShield(26736,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcIronShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronShield"); @@ -475,7 +475,7 @@ public class CustomItems { shield = new ItemShield(26739,EnumNpcToolMaterial.DEMONIC).setUnlocalizedName("npcDemonicShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicShield"); shield = new ItemRotatedShield(26739,EnumNpcToolMaterial.FROST).setUnlocalizedName("npcFrostShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostShield"); shield = new ItemRotatedShield(26739,EnumNpcToolMaterial.MITHRIL).setUnlocalizedName("npcMithrilShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilShield"); - + shield = new ItemRotatedShield(26740,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcFullWoodenShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenShield"); shield = new ItemRotatedShield(26741,EnumNpcToolMaterial.STONE).setUnlocalizedName("npcFullStoneShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFullStoneShield"); shield = new ItemRotatedShield(26742,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcFullIronShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFullIronShield"); @@ -492,7 +492,7 @@ public class CustomItems { shield = new ItemShield(26747,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcCryscentShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcCryscentShield"); shield = new ItemShield(26748,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcScutumShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcScutumShield"); shield = new ItemRotatedShield(26749,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcTowerShield").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcTowerShield"); - + Item spear = new ItemSpear(26750,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenSpear"); spear = new ItemSpear(26751,ToolMaterial.STONE).setUnlocalizedName("npcStoneSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneSpear"); spear = new ItemSpear(26752,ToolMaterial.IRON).setUnlocalizedName("npcIronSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronSpear"); @@ -503,7 +503,7 @@ public class CustomItems { spear = new ItemSpear(26756,demonic).setUnlocalizedName("npcDemonicSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicSpear"); spear = new ItemSpear(26756,frost).setUnlocalizedName("npcFrostSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostSpear"); spear = new ItemSpear(26756,mithril).setUnlocalizedName("npcMithrilSpear").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilSpear"); - + halberdWood = new ItemSpear(26750,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenHalberd"); halberdStone = new ItemSpear(26751,ToolMaterial.STONE).setUnlocalizedName("npcStoneHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneHalberd"); halberdIron = new ItemSpear(26752,ToolMaterial.IRON).setUnlocalizedName("npcIronHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronHalberd"); @@ -514,7 +514,7 @@ public class CustomItems { halberdDemonic = new ItemSpear(26756,demonic).setUnlocalizedName("npcDemonicHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicHalberd"); halberdFrost = new ItemSpear(26756,frost).setUnlocalizedName("npcFrostHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostHalberd"); halberdMithril = new ItemSpear(26756,mithril).setUnlocalizedName("npcMithrilHalberd").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilHalberd"); - + battleAxeWood = new ItemBattleAxe(26760,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenBattleAxe"); battleAxeStone = new ItemBattleAxe(26761,ToolMaterial.STONE).setUnlocalizedName("npcStoneBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneBattleAxe"); battleAxeIron = new ItemBattleAxe(26762,ToolMaterial.IRON).setUnlocalizedName("npcIronBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronBattleAxe"); @@ -525,7 +525,7 @@ public class CustomItems { battleAxeDemonic = new ItemBattleAxe(26766,demonic).setUnlocalizedName("npcDemonicBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicBattleAxe"); battleAxeFrost = new ItemBattleAxe(26766,frost).setUnlocalizedName("npcFrostBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostBattleAxe"); battleAxeMithril = new ItemBattleAxe(26766,mithril).setUnlocalizedName("npcMithrilBattleAxe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilBattleAxe"); - + Item warhammer = new ItemWarhammer(26760,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenWarhammer"); warhammer = new ItemWarhammer(26761,ToolMaterial.STONE).setUnlocalizedName("npcStoneWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneWarhammer"); warhammer = new ItemWarhammer(26762,ToolMaterial.IRON).setUnlocalizedName("npcIronWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronWarhammer"); @@ -536,7 +536,7 @@ public class CustomItems { warhammer = new ItemWarhammer(26766,demonic).setUnlocalizedName("npcDemonicWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicWarhammer"); warhammer = new ItemWarhammer(26766,frost).setUnlocalizedName("npcFrostWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostWarhammer"); warhammer = new ItemWarhammer(26766,mithril).setUnlocalizedName("npcMithrilWarhammer").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilWarhammer"); - + Item mace = new ItemNpcWeaponInterface(26770,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenMace"); mace = new ItemNpcWeaponInterface(26771,ToolMaterial.STONE).setUnlocalizedName("npcStoneMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneMace"); mace = new ItemNpcWeaponInterface(26772,ToolMaterial.IRON).setUnlocalizedName("npcIronMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronMace"); @@ -547,7 +547,7 @@ public class CustomItems { mace = new ItemNpcWeaponInterface(26776,demonic).setUnlocalizedName("npcDemonicMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicMace"); mace = new ItemNpcWeaponInterface(26776,frost).setUnlocalizedName("npcFrostMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostMace"); mace = new ItemNpcWeaponInterface(26776,mithril).setUnlocalizedName("npcMithrilMace").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilMace"); - + Item dagger = new ItemDagger(26700,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenDagger"); dagger = new ItemDaggerReversed(26701, (ItemDagger) dagger, ToolMaterial.WOOD).setUnlocalizedName("npcWoodenReversedDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenDagger"); dagger = new ItemDagger(26702,ToolMaterial.STONE).setUnlocalizedName("npcStoneDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneDagger"); @@ -568,12 +568,12 @@ public class CustomItems { dagger = new ItemDaggerReversed(26713, (ItemDagger) dagger,frost).setUnlocalizedName("npcFrostReversedDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostDagger"); dagger = new ItemDagger(26712,mithril).setUnlocalizedName("npcMithrilDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilDagger"); dagger = new ItemDaggerReversed(26713, (ItemDagger) dagger,frost).setUnlocalizedName("npcMithrilReversedDagger").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilDagger"); - + Item claw = new ItemClaw(26850,ToolMaterial.IRON).setUnlocalizedName("npcNinjaClaw").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcNinjaClaw"); claw = new ItemClaw(26851,ToolMaterial.IRON).setUnlocalizedName("npcSteelClaw").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcSteelClaw"); claw = new ItemClaw(26852,ToolMaterial.IRON).setUnlocalizedName("npcBearClaw").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcBearClaw"); claw = new ItemClaw(26853,ToolMaterial.IRON).setUnlocalizedName("npcKatar").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcKatar"); - + staffWood = new ItemStaff(26777,EnumNpcToolMaterial.WOOD).setUnlocalizedName("npcWoodenStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenStaff"); staffStone = new ItemStaff(26778,EnumNpcToolMaterial.STONE).setUnlocalizedName("npcStoneStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneStaff"); staffIron = new ItemStaff(26779,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcIronStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronStaff"); @@ -585,7 +585,7 @@ public class CustomItems { staffFrost = new ItemStaff(26783,EnumNpcToolMaterial.FROST).setUnlocalizedName("npcFrostStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostStaff"); staffMithril = new ItemStaff(26783,EnumNpcToolMaterial.MITHRIL).setUnlocalizedName("npcMithrilStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilStaff"); staffElemental = new ItemElementalStaff(26784,EnumNpcToolMaterial.IRON).setUnlocalizedName("npcElementalStaff").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcElementalStaff"); - + Item scythe = new ItemScythe(26785,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenScythe"); scythe = new ItemScythe(26786,ToolMaterial.STONE).setUnlocalizedName("npcStoneScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneScythe"); scythe = new ItemScythe(26787,ToolMaterial.IRON).setUnlocalizedName("npcIronScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronScythe"); @@ -596,7 +596,7 @@ public class CustomItems { scythe = new ItemScythe(26797,demonic).setUnlocalizedName("npcDemonicScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicScythe"); scythe = new ItemScythe(26797,frost).setUnlocalizedName("npcFrostScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostScythe"); scythe = new ItemScythe(26797,mithril).setUnlocalizedName("npcMithrilScythe").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilScythe"); - + glaiveWood = new ItemGlaive(26790,ToolMaterial.WOOD).setUnlocalizedName("npcWoodenGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenGlaive"); glaiveStone = new ItemGlaive(26791,ToolMaterial.STONE).setUnlocalizedName("npcStoneGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneGlaive"); glaiveIron = new ItemGlaive(26792,ToolMaterial.IRON).setUnlocalizedName("npcIronGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronGlaive"); @@ -607,7 +607,7 @@ public class CustomItems { glaiveDemonic = new ItemGlaive(26796,demonic).setUnlocalizedName("npcDemonicGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcDemonicGlaive"); glaiveFrost = new ItemGlaive(26796,frost).setUnlocalizedName("npcFrostGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcFrostGlaive"); glaiveMithril = new ItemGlaive(26796,mithril).setUnlocalizedName("npcMithrilGlaive").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcMithrilGlaive"); - + new ItemBroadSword(ToolMaterial.WOOD).setUnlocalizedName("npcWoodenBroadsword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcWoodenBroadsword"); new ItemBroadSword(ToolMaterial.STONE).setUnlocalizedName("npcStoneBroadsword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcStoneBroadsword"); new ItemBroadSword(ToolMaterial.IRON).setUnlocalizedName("npcIronBroadsword").setFull3D().setMaxStackSize(1).setTextureName("customnpcs:npcIronBroadsword"); @@ -622,37 +622,37 @@ public class CustomItems { ItemArmor.ArmorMaterial armorMithril = EnumHelper.addArmorMaterial("MITHRIL", 40, new int[]{3, 8, 6, 3}, 20); ItemArmor.ArmorMaterial armorBronze = EnumHelper.addArmorMaterial("BRONZE", 7, new int[]{2, 6, 5, 2}, 20); ItemArmor.ArmorMaterial armorEmerald = EnumHelper.addArmorMaterial("EMERALD", 35, new int[]{5, 7, 4, 5}, 5); - + Item cowarmor = new ItemNpcArmor(26860, ArmorMaterial.CHAIN,0,"cowleather").setUnlocalizedName("npcCowleatherHead").setMaxStackSize(1).setTextureName("customnpcs:npcCowleatherHead"); Item armor = new ItemNpcArmor(26861,ArmorMaterial.CHAIN,1,"cowleather").setUnlocalizedName("npcCowleatherChest").setMaxStackSize(1).setTextureName("customnpcs:npcCowleatherChest"); armor = new ItemNpcArmor(26862,ArmorMaterial.CHAIN,2,"cowleather").setUnlocalizedName("npcCowleatherLegs").setMaxStackSize(1).setTextureName("customnpcs:npcCowleatherLegs"); armor = new ItemNpcArmor(26863,ArmorMaterial.CHAIN,3,"cowleather").setUnlocalizedName("npcCowleatherBoots").setMaxStackSize(1).setTextureName("customnpcs:npcCowleatherBoots"); - + armor = new ItemNpcArmor(26864,ArmorMaterial.IRON,0,"nanorum").setUnlocalizedName("npcNanorumHead").setMaxStackSize(1).setTextureName("customnpcs:npcNanorumHead"); armor = new ItemNpcArmor(26865,ArmorMaterial.IRON,1,"nanorum").setUnlocalizedName("npcNanorumChest").setMaxStackSize(1).setTextureName("customnpcs:npcNanorumChest"); armor = new ItemNpcArmor(26866,ArmorMaterial.IRON,2,"nanorum").setUnlocalizedName("npcNanorumLegs").setMaxStackSize(1).setTextureName("customnpcs:npcNanorumLegs"); armor = new ItemNpcArmor(26867,ArmorMaterial.IRON,3,"nanorum").setUnlocalizedName("npcNanorumBoots").setMaxStackSize(1).setTextureName("customnpcs:npcNanorumBoots"); - + armor = new ItemNpcArmor(26868,ArmorMaterial.IRON,0,"tactical").setUnlocalizedName("npcTacticalHead").setMaxStackSize(1).setTextureName("customnpcs:npcTacticalHead"); armor = new ItemNpcArmor(26869,ArmorMaterial.IRON,1,"tactical").setUnlocalizedName("npcTacticalChest").setMaxStackSize(1).setTextureName("customnpcs:npcTacticalChest"); - + armor = new ItemNpcArmor(26919,ArmorMaterial.IRON,0,"fullcloth").setUnlocalizedName("npcFullLeatherHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullLeatherHead"); armor = new ItemNpcArmor(26920,ArmorMaterial.IRON,1,"fullcloth").setUnlocalizedName("npcFullLeatherChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullLeatherChest"); - + armor = new ItemNpcArmor(26870,ArmorMaterial.IRON,0,"fulliron").setUnlocalizedName("npcFullIronHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullIronHead"); armor = new ItemNpcArmor(26871,ArmorMaterial.IRON,1,"fulliron").setUnlocalizedName("npcFullIronChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullIronChest"); - + armor = new ItemNpcArmor(26872,ArmorMaterial.GOLD,0,"fullgold").setUnlocalizedName("npcFullGoldHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullGoldHead"); armor = new ItemNpcArmor(26873,ArmorMaterial.GOLD,1,"fullgold").setUnlocalizedName("npcFullGoldChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullGoldChest"); - + armor = new ItemNpcArmor(26874,ArmorMaterial.DIAMOND,0,"fulldiamond").setUnlocalizedName("npcFullDiamondHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullDiamondHead"); armor = new ItemNpcArmor(26875,ArmorMaterial.DIAMOND,1,"fulldiamond").setUnlocalizedName("npcFullDiamondChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullDiamondChest"); - + armor = new ItemNpcArmor(26876, armorBronze,0,"fullbronze").setUnlocalizedName("npcFullBronzeHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullBronzeHead"); armor = new ItemNpcArmor(26877, armorBronze,1,"fullbronze").setUnlocalizedName("npcFullBronzeChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullBronzeChest"); armor = new ItemNpcArmor(26878, armorBronze,2,"fullbronze").setUnlocalizedName("npcFullBronzeLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcFullBronzeLeggings"); armor = new ItemNpcArmor(26879, armorBronze,3,"fullbronze").setUnlocalizedName("npcFullBronzeBoots").setMaxStackSize(1).setTextureName("customnpcs:npcFullBronzeBoots"); - + armor = new ItemNpcArmor(26921, armorEmerald,0,"fullemerald").setUnlocalizedName("npcFullEmeraldHead").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldHead"); armor = new ItemNpcArmor(26922, armorEmerald,1,"fullemerald").setUnlocalizedName("npcFullEmeraldChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldChest"); armor = new ItemNpcArmor(26923, armorEmerald,2,"fullemerald").setUnlocalizedName("npcFullEmeraldLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcFullEmeraldLeggings"); @@ -662,20 +662,20 @@ public class CustomItems { armor = new ItemNpcArmor(26881,ArmorMaterial.CLOTH,1,"fullwood").setUnlocalizedName("npcFullWoodenChest").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenChest"); armor = new ItemNpcArmor(26882,ArmorMaterial.CLOTH,2,"fullwood").setUnlocalizedName("npcFullWoodenLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenLeggings"); armor = new ItemNpcArmor(26883,ArmorMaterial.CLOTH,3,"fullwood").setUnlocalizedName("npcFullWoodenBoots").setMaxStackSize(1).setTextureName("customnpcs:npcFullWoodenBoots"); - + armor = new ItemNpcArmor(26884,ArmorMaterial.CHAIN,1,"tuxido").setUnlocalizedName("npcTuxedoChest").setMaxStackSize(1).setTextureName("customnpcs:npcTuxedoChest"); armor = new ItemNpcArmor(26885,ArmorMaterial.CHAIN,2,"tuxido").setUnlocalizedName("npcTuxedoPants").setMaxStackSize(1).setTextureName("customnpcs:npcTuxedoPants"); armor = new ItemNpcArmor(26886,ArmorMaterial.CHAIN,3,"tuxido").setUnlocalizedName("npcTuxedoBottom").setMaxStackSize(1).setTextureName("customnpcs:npcTuxedoBottom"); - + armor = new ItemNpcArmor(26887,ArmorMaterial.CHAIN,0,"wizard").setUnlocalizedName("npcWizardHead").setMaxStackSize(1).setTextureName("customnpcs:npcWizardHead"); armor = new ItemNpcArmor(26888,ArmorMaterial.CHAIN,1,"wizard").setUnlocalizedName("npcWizardChest").setMaxStackSize(1).setTextureName("customnpcs:npcWizardChest"); armor = new ItemNpcArmor(26889,ArmorMaterial.CHAIN,2,"wizard").setUnlocalizedName("npcWizardPants").setMaxStackSize(1).setTextureName("customnpcs:npcWizardPants"); - + armor = new ItemNpcArmor(26890,ArmorMaterial.IRON,0,"assassin").setUnlocalizedName("npcAssassinHead").setMaxStackSize(1).setTextureName("customnpcs:npcAssassinHead"); armor = new ItemNpcArmor(26891,ArmorMaterial.IRON,1,"assassin").setUnlocalizedName("npcAssassinChest").setMaxStackSize(1).setTextureName("customnpcs:npcAssassinChest"); armor = new ItemNpcArmor(26892,ArmorMaterial.IRON,2,"assassin").setUnlocalizedName("npcAssassinLeggings").setMaxStackSize(1).setTextureName("customnpcs:npcAssassinLeggings"); armor = new ItemNpcArmor(26893,ArmorMaterial.IRON,3,"assassin").setUnlocalizedName("npcAssassinBoots").setMaxStackSize(1).setTextureName("customnpcs:npcAssassinBoots"); - + armor = new ItemNpcArmor(26894,ArmorMaterial.IRON,0,"soldier").setUnlocalizedName("npcSoldierHead").setMaxStackSize(1).setTextureName("customnpcs:npcSoldierHead"); armor = new ItemNpcArmor(26895,ArmorMaterial.IRON,1,"soldier").setUnlocalizedName("npcSoldierChest").setMaxStackSize(1).setTextureName("customnpcs:npcSoldierChest"); armor = new ItemNpcArmor(26896,ArmorMaterial.IRON,2,"soldier").setUnlocalizedName("npcSoldierLegs").setMaxStackSize(1).setTextureName("customnpcs:npcSoldierLegs"); @@ -695,23 +695,23 @@ public class CustomItems { armor = new ItemNpcArmor(26899,ArmorMaterial.DIAMOND,1,"demonic").setUnlocalizedName("npcDemonicChest").setMaxStackSize(1).setTextureName("customnpcs:npcDemonicChest"); armor = new ItemNpcArmor(26900,ArmorMaterial.DIAMOND,2,"demonic").setUnlocalizedName("npcDemonicLegs").setMaxStackSize(1).setTextureName("customnpcs:npcDemonicLegs"); armor = new ItemNpcArmor(26901,ArmorMaterial.DIAMOND,3,"demonic").setUnlocalizedName("npcDemonicBoots").setMaxStackSize(1).setTextureName("customnpcs:npcDemonicBoots"); - + armor = new ItemNpcArmor(26902,ArmorMaterial.GOLD,0,"commissar").setUnlocalizedName("npcCommissarHead").setMaxStackSize(1).setTextureName("customnpcs:npcCommissarHead"); armor = new ItemNpcArmor(26903,ArmorMaterial.GOLD,1,"commissar").setUnlocalizedName("npcCommissarChest").setMaxStackSize(1).setTextureName("customnpcs:npcCommissarChest"); armor = new ItemNpcArmor(26904,ArmorMaterial.GOLD,2,"commissar").setUnlocalizedName("npcCommissarLegs").setMaxStackSize(1).setTextureName("customnpcs:npcCommissarLegs"); armor = new ItemNpcArmor(26905,ArmorMaterial.GOLD,3,"commissar").setUnlocalizedName("npcCommissarBottom").setMaxStackSize(1).setTextureName("customnpcs:npcCommissarBottom"); - + armor = new ItemNpcArmor(26906,ArmorMaterial.IRON,0,"infantry").setUnlocalizedName("npcInfantryHelmet").setMaxStackSize(1).setTextureName("customnpcs:npcInfantryHelmet"); armor = new ItemNpcArmor(26907,ArmorMaterial.DIAMOND,1,"officer").setUnlocalizedName("npcOfficerChest").setMaxStackSize(1).setTextureName("customnpcs:npcOfficerChest"); - + armor = new ItemNpcArmor(26908,ArmorMaterial.DIAMOND,0,"crown1").setUnlocalizedName("npcCrown2").setMaxStackSize(1).setTextureName("customnpcs:npcCrown2"); armor = new ItemNpcArmor(26909,ArmorMaterial.DIAMOND,0,"crown2").setUnlocalizedName("npcCrown").setMaxStackSize(1).setTextureName("customnpcs:npcCrown"); armor = new ItemNpcArmorColorable(26909,ArmorMaterial.CLOTH,0,"papercrown").setUnlocalizedName("npcPaperCrown").setMaxStackSize(1).setTextureName("customnpcs:npcPaperCrown"); - + armor = new ItemNpcArmor(26916,ArmorMaterial.IRON,0,"ninja").setUnlocalizedName("npcNinjaHead").setMaxStackSize(1).setTextureName("customnpcs:npcNinjaHead"); armor = new ItemNpcArmor(26917,ArmorMaterial.IRON,1,"ninja").setUnlocalizedName("npcNinjaChest").setMaxStackSize(1).setTextureName("customnpcs:npcNinjaChest"); armor = new ItemNpcArmor(26918,ArmorMaterial.IRON,2,"ninja").setUnlocalizedName("npcNinjaPants").setMaxStackSize(1).setTextureName("customnpcs:npcNinjaPants"); - + armor = new ItemSkirt(ArmorMaterial.CHAIN,"textures/models/armor/chainmail_layer_2.png").setUnlocalizedName("npcChainSkirt").setTextureName("customnpcs:npcChainSkirt"); armor = new ItemSkirt(ArmorMaterial.CLOTH,"textures/models/armor/leather_layer_2.png").setUnlocalizedName("npcLeatherSkirt").setTextureName("customnpcs:npcLeatherSkirt"); armor = new ItemSkirt(ArmorMaterial.GOLD,"textures/models/armor/gold_layer_2.png").setUnlocalizedName("npcGoldSkirt").setTextureName("customnpcs:npcGoldSkirt"); @@ -721,8 +721,8 @@ public class CustomItems { armor = new ItemSkirt(armorBronze,"customnpcs:textures/armor/fullbronze_2.png").setUnlocalizedName("npcBronzeSkirt").setTextureName("customnpcs:npcBronzeSkirt"); armor = new ItemSkirt(ArmorMaterial.DIAMOND,"customnpcs:textures/armor/demonic_2.png").setUnlocalizedName("npcDemonicSkirt").setTextureName("customnpcs:npcDemonicSkirt"); armor = new ItemSkirt(armorMithril,"customnpcs:textures/armor/mithril_2.png").setUnlocalizedName("npcMithrilSkirt").setTextureName("customnpcs:npcMithrilSkirt"); - - + + coinWood = new ItemNpcInterface(26717).setUnlocalizedName("npcCoinWooden").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCoinWooden"); coinStone = new ItemNpcInterface(26718).setUnlocalizedName("npcCoinStone").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCoinStone"); coinBronze = new ItemNpcInterface(26719).setUnlocalizedName("npcCoinBronze").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCoinBronze"); @@ -731,23 +731,23 @@ public class CustomItems { coinDiamond = new ItemNpcInterface(26722).setUnlocalizedName("npcCoinDiamond").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCoinDiamond"); coinEmerald = new ItemNpcInterface(26723).setUnlocalizedName("npcCoinEmerald").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCoinEmerald"); Item quest = new ItemNpcInterface().setUnlocalizedName("npcAncientCoin").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAncientCoin"); - + letter = new ItemNpcInterface(26950).setUnlocalizedName("npcLetter").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcLetter"); quest = new ItemNpcInterface(26951).setUnlocalizedName("npcPlans").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcPlans"); satchel = new ItemNpcInterface(26952).setUnlocalizedName("npcSatchel").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcSatchel"); bag = new ItemNpcInterface(26953).setUnlocalizedName("npcBag").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBag"); - + quest = new ItemNpcInterface(26954).setUnlocalizedName("npcCrystal").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCrystal"); quest = new ItemNpcInterface(26955).setUnlocalizedName("npcSeveredEar").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcSeveredEar"); quest = new ItemNpcInterface(26956).setUnlocalizedName("npcPhone").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcPhone"); - + quest = new ItemNpcArmor(26957,ArmorMaterial.IRON,0,"mask").setMaxStackSize(64).setUnlocalizedName("npcBanditMask").setCreativeTab(CustomItems.tabArmor).setTextureName("customnpcs:npcBanditMask"); quest = new ItemNpcInterface(26958).setUnlocalizedName("npcBrokenArrow").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBrokenArrow"); quest = new ItemNpcInterface(26959).setUnlocalizedName("npcEarthElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcEarthElement"); quest = new ItemNpcInterface(26960).setUnlocalizedName("npcWaterElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcWaterElement"); quest = new ItemNpcInterface(26961).setUnlocalizedName("npcFireElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcFireElement"); quest = new ItemNpcInterface(26962).setUnlocalizedName("npcAirElement").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAirElement"); - + quest = new ItemNpcInterface(26963).setUnlocalizedName("npcCarKey").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcCarKey"); quest = new ItemNpcInterface(26964).setUnlocalizedName("npcKey").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcKey"); quest = new ItemNpcInterface(26965).setUnlocalizedName("npcKey2").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcKey2"); @@ -755,7 +755,7 @@ public class CustomItems { quest = new ItemNpcInterface(26967).setUnlocalizedName("npcBlueprint").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBlueprint"); quest = new ItemNpcInterface(26968).setUnlocalizedName("npcRing").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcRing"); quest = new ItemNpcInterface(26969).setUnlocalizedName("npcSkull").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcSkull"); - + Item sapphire = new ItemNpcInterface(26970).setUnlocalizedName("npcSaphire").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcSaphire"); Item ruby = new ItemNpcInterface(26971).setUnlocalizedName("npcRuby").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcRuby"); Item amethyst = new ItemNpcInterface(26972).setUnlocalizedName("npcAmethyst").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAmethyst"); @@ -763,23 +763,23 @@ public class CustomItems { OreDictionary.registerOre("gemSaphire", sapphire); OreDictionary.registerOre("gemRuby", ruby); OreDictionary.registerOre("gemAmethyst", amethyst); - + bronze_ingot = new ItemNpcInterface(26973).setUnlocalizedName("npcBronzeIngot").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcBronzeIngot"); demonic_ingot = new ItemNpcInterface(26973).setUnlocalizedName("npcDemonicIngot").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcDemonicIngot"); mithril_ingot = new ItemNpcInterface(26973).setUnlocalizedName("npcMithrilIngot").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcMithrilIngot"); armorMithril.customCraftingMaterial = mithril_ingot; - + bronze.customCraftingMaterial = bronze_ingot; emerald.customCraftingMaterial = Items.emerald; demonic.customCraftingMaterial = demonic_ingot; frost.customCraftingMaterial = Item.getItemFromBlock(Blocks.ice); mithril.customCraftingMaterial = mithril_ingot; - + OreDictionary.registerOre("ingotBronze", bronze_ingot); OreDictionary.registerOre("ingotDemonic", demonic_ingot); OreDictionary.registerOre("ingotMithril", mithril_ingot); - + quest = new ItemNpcInterface().setUnlocalizedName("npcAncientScroll").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcAncientScroll"); quest = new ItemNpcInterface().setUnlocalizedName("npcArtifact").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcArtifact"); quest = new ItemNpcInterface().setUnlocalizedName("npcLocket").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcLocket"); @@ -791,12 +791,12 @@ public class CustomItems { quest = new ItemNpcInterface().setUnlocalizedName("npcMoney").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcMoney"); quest = new ItemNpcInterface().setUnlocalizedName("npcNecklace").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcNecklace"); quest = new ItemNpcInterface().setUnlocalizedName("npcUsbStick").setCreativeTab(CustomItems.tabMisc).setTextureName("customnpcs:npcUsbStick"); - + tabArmor.item = cowarmor; tabWeapon.item = CustomItems.shuriken; tabMisc.item = CustomItems.coinGold; } - + tab.item = wand; } } diff --git a/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png b/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png index 9f7a63fee..d5da55ddd 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png and b/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png.mcmeta new file mode 100644 index 000000000..50f0f2fd8 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcAirElement.png.mcmeta @@ -0,0 +1,14 @@ +{ + "animation": { + "frametime": 4, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcAmethyst.png b/src/main/resources/assets/customnpcs/textures/items/npcAmethyst.png index 9734c3571..b8ddb120f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcAmethyst.png and b/src/main/resources/assets/customnpcs/textures/items/npcAmethyst.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcAncientCoin.png b/src/main/resources/assets/customnpcs/textures/items/npcAncientCoin.png index 9a6d8cecd..086da4c49 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcAncientCoin.png and b/src/main/resources/assets/customnpcs/textures/items/npcAncientCoin.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcAncientScroll.png b/src/main/resources/assets/customnpcs/textures/items/npcAncientScroll.png index 4813f3bc7..8c157b58e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcAncientScroll.png and b/src/main/resources/assets/customnpcs/textures/items/npcAncientScroll.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png index b949d03dd..31982fea8 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png.mcmeta new file mode 100644 index 000000000..f412b7dd3 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcArcaneSpell.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frametime": 4, + "interpolate": false, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcArtifact.png b/src/main/resources/assets/customnpcs/textures/items/npcArtifact.png index 4570b104d..8e709f389 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcArtifact.png and b/src/main/resources/assets/customnpcs/textures/items/npcArtifact.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBanjo.png b/src/main/resources/assets/customnpcs/textures/items/npcBanjo.png index 4a041bdb6..ffd7c7b4f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBanjo.png and b/src/main/resources/assets/customnpcs/textures/items/npcBanjo.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBaseballBat.png b/src/main/resources/assets/customnpcs/textures/items/npcBaseballBat.png index ea825d4c0..2cb807166 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBaseballBat.png and b/src/main/resources/assets/customnpcs/textures/items/npcBaseballBat.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBatton.png b/src/main/resources/assets/customnpcs/textures/items/npcBatton.png index c0c6864e5..ce28a24a1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBatton.png and b/src/main/resources/assets/customnpcs/textures/items/npcBatton.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBearClaw.png b/src/main/resources/assets/customnpcs/textures/items/npcBearClaw.png index 0e9d97975..f12819715 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBearClaw.png and b/src/main/resources/assets/customnpcs/textures/items/npcBearClaw.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBlackBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcBlackBullet.png index ba7ae7382..1f7cf7b97 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBlackBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcBlackBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBlueprint.png b/src/main/resources/assets/customnpcs/textures/items/npcBlueprint.png index fdf7455a5..f743fe222 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBlueprint.png and b/src/main/resources/assets/customnpcs/textures/items/npcBlueprint.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBoStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcBoStaff.png index d833ad661..579692c99 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBoStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcBoStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBrokenBottle.png b/src/main/resources/assets/customnpcs/textures/items/npcBrokenBottle.png index 3c89d04da..94a90e047 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBrokenBottle.png and b/src/main/resources/assets/customnpcs/textures/items/npcBrokenBottle.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBrokenOrb.png b/src/main/resources/assets/customnpcs/textures/items/npcBrokenOrb.png index 473ec5c0a..e19142f8d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBrokenOrb.png and b/src/main/resources/assets/customnpcs/textures/items/npcBrokenOrb.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBattleAxe.png index 2977777db..f2234ca45 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBroadsword.png index f8a0128ed..fbda79c3a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBullet.png index bac60ed0d..171784d2e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeDagger.png index e80e33c3c..252960e8f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeGlaive.png index fa308c910..a7eb4caa3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeGun.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeGun.png index 76ca218fc..e1dfe1cf3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeHalberd.png index 23e26942f..a1a3eeba6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeIngot.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeIngot.png index caf1957e0..76d935e28 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeIngot.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeIngot.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeMace.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeMace.png index 8366e5bcf..c4e3150e3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeScythe.png index ca7e90183..a89429e6f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeShield.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeShield.png index 25170a197..5c3aa87d0 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeSpear.png index c8349f53a..d44cff652 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeStaff.png index feb0d5242..2bb533c53 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeSword.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeSword.png index c4e2a881d..f79a6c39f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeSword.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeSword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeTrident.png index 6c23b3889..728dd5ce9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcBronzeWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcBronzeWarhammer.png index 3342ea124..4c034aef0 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcBronzeWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcBronzeWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCarKey.png b/src/main/resources/assets/customnpcs/textures/items/npcCarKey.png index 9da836c7b..92677be24 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCarKey.png and b/src/main/resources/assets/customnpcs/textures/items/npcCarKey.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcClarinet.png b/src/main/resources/assets/customnpcs/textures/items/npcClarinet.png index 87d7fbe96..df623d8bc 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcClarinet.png and b/src/main/resources/assets/customnpcs/textures/items/npcClarinet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCleaver.png b/src/main/resources/assets/customnpcs/textures/items/npcCleaver.png index 3c27b482f..2d876f54a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCleaver.png and b/src/main/resources/assets/customnpcs/textures/items/npcCleaver.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinBronze.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinBronze.png index ba129d4d8..77f31c8bf 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinBronze.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinBronze.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinDiamond.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinDiamond.png index 1ef98485c..a88f38d37 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinDiamond.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinDiamond.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinEmerald.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinEmerald.png index 186f88a49..e3b23c394 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinEmerald.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinEmerald.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinGold.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinGold.png index 25d67ae98..7fb9e62ba 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinGold.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinGold.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinIron.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinIron.png index 4ef6a2b5d..f70e1dc0c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinIron.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinIron.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinStone.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinStone.png index 3a016a797..af7717189 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinStone.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinStone.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCoinWooden.png b/src/main/resources/assets/customnpcs/textures/items/npcCoinWooden.png index c23a63494..bfcbf0cc9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCoinWooden.png and b/src/main/resources/assets/customnpcs/textures/items/npcCoinWooden.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCombatKnife.png b/src/main/resources/assets/customnpcs/textures/items/npcCombatKnife.png new file mode 100644 index 000000000..c30df162f Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcCombatKnife.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCrossBolt.png b/src/main/resources/assets/customnpcs/textures/items/npcCrossBolt.png index bf5354ba2..c95c14513 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCrossBolt.png and b/src/main/resources/assets/customnpcs/textures/items/npcCrossBolt.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCrossbow.png b/src/main/resources/assets/customnpcs/textures/items/npcCrossbow.png index 9100783c6..ffa44dc60 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCrossbow.png and b/src/main/resources/assets/customnpcs/textures/items/npcCrossbow.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCrowbar.png b/src/main/resources/assets/customnpcs/textures/items/npcCrowbar.png index 4a55ca375..2dac2b265 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCrowbar.png and b/src/main/resources/assets/customnpcs/textures/items/npcCrowbar.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCryscentShield.png b/src/main/resources/assets/customnpcs/textures/items/npcCryscentShield.png index bf292d2ea..96ce889eb 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCryscentShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcCryscentShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCrystal.png b/src/main/resources/assets/customnpcs/textures/items/npcCrystal.png index e5e6d3b00..7fe60fa5f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCrystal.png and b/src/main/resources/assets/customnpcs/textures/items/npcCrystal.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcCursedTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcCursedTrident.png index 14688ed4d..60a5b5a1c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcCursedTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcCursedTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png index cfb5aa4b1..a6cb1ddc7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png.mcmeta new file mode 100644 index 000000000..c1f47afdd --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcDarkSpell.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicBattleAxe.png index 70ee10106..2f274b672 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicBroadsword.png index 7e60ead87..7785309a9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicDagger.png index fdb28faa0..d7a38c84d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicGlaive.png index a242436ae..514073fc6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicHalberd.png index 321439064..925b1a467 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngot.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngot.png index 5364eaf1a..381f96b29 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngot.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngot.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngotnew.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngotnew.png new file mode 100644 index 000000000..381f96b29 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicIngotnew.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicMace.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicMace.png index 1847e5e42..7b2d820ba 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicScythe.png index d1d52d98d..d78cc2e38 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicShield.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicShield.png index a5ac51c04..9b126d20a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicSpear.png index bb7c8e859..74319d56d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicStaff.png index bd1c5901e..ab45eab1d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicSword.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicSword.png index 1a507cb37..0801949c4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicSword.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicSword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicTrident.png index 84cd08b19..fa4b81cf6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDemonicWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcDemonicWarhammer.png index 7d7b7f65b..4cada0b8c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDemonicWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcDemonicWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiaShield.png b/src/main/resources/assets/customnpcs/textures/items/npcDiaShield.png index 42a23b1fa..746d72c9b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiaShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiaShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBattleAxe.png index 99719dfcb..fa5db235b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBroadsword.png index 9e5546c1d..f38a04b00 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBullet.png index 3ead3f54d..eebf13622 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondDagger.png index 065ab1034..93565bbb5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondGlaive.png index ce6519841..5ce1d1f9c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondGun.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondGun.png index 9b42c7fed..a8dd05faa 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondHalberd.png index 2ff786d15..8c046f171 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondMace.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondMace.png index f700186fd..5e03dfd89 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondScythe.png index 50291979d..e0f88218b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondShield.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondShield.png new file mode 100644 index 000000000..746d72c9b Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondSpear.png index e2a1e97e5..a2ec11598 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondStaff.png index a5dea0da0..1652b27bb 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondTrident.png index 79c86effc..c0603e19d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcDiamondWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcDiamondWarhammer.png index ab274efae..765e13731 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcDiamondWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcDiamondWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png b/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png index 48b9d6d6a..71ba67dbc 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png and b/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png.mcmeta new file mode 100644 index 000000000..71b657e59 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcEarthElement.png.mcmeta @@ -0,0 +1,32 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 60 + }, { + "index": 1, + "time": 2 + }, { + "index": 2, + "time": 2 + }, { + "index": 3, + "time": 2 + }, { + "index": 4, + "time": 2 + }, { + "index": 5, + "time": 2 + }, { + "index": 6, + "time": 2 + }, { + "index": 7, + "time": 2 + } + ] + } +} diff --git a/src/main/resources/assets/customnpcs/textures/items/npcElementalStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcElementalStaff.png index d766254b6..e25c6ed26 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcElementalStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcElementalStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBattleAxe.png index d03e6f14d..7196f56d5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBroadsword.png index 524dcfca8..322bdcbe5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBullet.png index 4d556cd4f..fad314f09 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldDagger.png index 0e149f5bb..84785d606 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGlaive.png index 2a8fce2f4..9ea5cc9bc 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGun.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGun.png index 9083a2cea..2fe515bec 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldHalberd.png index 531afc976..fcb8e625d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldMace.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldMace.png index 224033710..2017ec66d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldScythe.png index 4c6b62076..1e35a4bb0 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldShield.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldShield.png index 273a90fe7..53d9d272d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSpear.png index 4e2fdd9c5..d7395c925 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldStaff.png index 373dc9d91..9b595cfd7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSword.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSword.png index 793bf4aa1..96a6a07c4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSword.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldSword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldTrident.png index f74f8e576..08fac315d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldWarhammer.png index 981ed513e..c3ea8c23b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcEmeraldWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcEmeraldWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcExcalibur.png b/src/main/resources/assets/customnpcs/textures/items/npcExcalibur.png index 4992c8151..84137e482 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcExcalibur.png and b/src/main/resources/assets/customnpcs/textures/items/npcExcalibur.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png b/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png index 4351404dd..95720ada7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png and b/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png.mcmeta new file mode 100644 index 000000000..364f32943 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcFireElement.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 6, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png index 6c46eea11..9cd20234d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png.mcmeta new file mode 100644 index 000000000..f53b1b798 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcFireSpell.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 2, + "interpolate": false, + "frames": [ + 0, + 1, + 2, + 3, + 4 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrenchHorn.png b/src/main/resources/assets/customnpcs/textures/items/npcFrenchHorn.png index 1af1051b2..a8a2065f0 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrenchHorn.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrenchHorn.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostBattleAxe.png index ffd05c3c2..5bb5a9f62 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostBroadsword.png index d5f46d559..5a25dc6bf 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostDagger.png index 3a5cd1dda..3d8be5d06 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostGlaive.png index 1491441bd..1160cc7dd 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostHalberd.png index 857492515..025ee3e34 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostMace.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostMace.png index e8efcbd39..b5fa0ee31 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostScythe.png index d4e023405..55054b703 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostShield.png index fb089dcc4..f286b6f16 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostSpear.png index d4d77dc02..2ce24652a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostStaff.png index 2f2d9a2af..057d512d6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostSword.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostSword.png index f4d49475b..28e968a81 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostSword.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostSword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostTrident.png index 39b8c5d2d..34ebd7280 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFrostWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcFrostWarhammer.png index 1ed7c6726..228500b5d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFrostWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcFrostWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullBronzeShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullBronzeShield.png index 901a48eee..d33d1a6c5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullBronzeShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullBronzeShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullDemonicShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullDemonicShield.png new file mode 100644 index 000000000..98a66e04f Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcFullDemonicShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullDiaShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullDiaShield.png index c89ad0035..1ff9f2a1d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullDiaShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullDiaShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullDiamondShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullDiamondShield.png new file mode 100644 index 000000000..1ff9f2a1d Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcFullDiamondShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullEmeraldShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullEmeraldShield.png index 28a10dea8..1260d5fcc 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullEmeraldShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullEmeraldShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullFrostShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullFrostShield.png new file mode 100644 index 000000000..6ba4439c4 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcFullFrostShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullGoldenShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullGoldenShield.png index ff6671c73..9c36786f1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullGoldenShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullGoldenShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullIronShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullIronShield.png index 1cb7f4204..33a52deb5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullIronShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullIronShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullMithrilShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullMithrilShield.png new file mode 100644 index 000000000..79a598bec Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcFullMithrilShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullStoneShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullStoneShield.png index 16f1f31e9..81bf30d4e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullStoneShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullStoneShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcFullWoodenShield.png b/src/main/resources/assets/customnpcs/textures/items/npcFullWoodenShield.png index b2362efdd..0504d0dce 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcFullWoodenShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcFullWoodenShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGiantShuriken.png b/src/main/resources/assets/customnpcs/textures/items/npcGiantShuriken.png index 80956d325..1d634e8ce 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGiantShuriken.png and b/src/main/resources/assets/customnpcs/textures/items/npcGiantShuriken.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldGun.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldGun.png index 81a614b0a..69a9ea65b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldTrident.png index cc8d9ba01..75c6b50c3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBattleAxe.png index 0b83aef02..a556b64e2 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBroadsword.png index cb376dee4..43eb8540a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBullet.png index 054d354ab..d32e8e6b4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenDagger.png index b700db60c..d7b602a2b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenGlaive.png index 25750681c..ee409f14d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenGun.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenGun.png new file mode 100644 index 000000000..69a9ea65b Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenHalberd.png index cb463a06a..0aba2b3b3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenMace.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenMace.png index a9176b54f..edd77ec72 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenScythe.png index 401c48a92..75f725edd 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenShield.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenShield.png index 1388c44ef..b22a8ccda 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenSpear.png index 27996fcdd..927b5f98b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenStaff.png index 0d14dc6bc..467261ba6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenTrident.png new file mode 100644 index 000000000..75c6b50c3 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGoldenWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcGoldenWarhammer.png index b48694387..398e4d660 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGoldenWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcGoldenWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGolfClub.png b/src/main/resources/assets/customnpcs/textures/items/npcGolfClub.png index 20d3d29ae..4b25484d1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGolfClub.png and b/src/main/resources/assets/customnpcs/textures/items/npcGolfClub.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGuitar.png b/src/main/resources/assets/customnpcs/textures/items/npcGuitar.png index 05e62a0f0..0fe7c2231 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGuitar.png and b/src/main/resources/assets/customnpcs/textures/items/npcGuitar.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcGunChainsaw.png b/src/main/resources/assets/customnpcs/textures/items/npcGunChainsaw.png index b61193127..3fa315856 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcGunChainsaw.png and b/src/main/resources/assets/customnpcs/textures/items/npcGunChainsaw.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHammer.png b/src/main/resources/assets/customnpcs/textures/items/npcHammer.png index e56f88978..37bf8c4ee 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcHammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHandCuffs.png b/src/main/resources/assets/customnpcs/textures/items/npcHandCuffs.png index 64c3cde84..99e113e2e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHandCuffs.png and b/src/main/resources/assets/customnpcs/textures/items/npcHandCuffs.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHarp.png b/src/main/resources/assets/customnpcs/textures/items/npcHarp.png index 8b11bec8e..df59c2992 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHarp.png and b/src/main/resources/assets/customnpcs/textures/items/npcHarp.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHeart.png b/src/main/resources/assets/customnpcs/textures/items/npcHeart.png index 211be9a8e..40e5214a1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHeart.png and b/src/main/resources/assets/customnpcs/textures/items/npcHeart.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHeaterShield.png b/src/main/resources/assets/customnpcs/textures/items/npcHeaterShield.png index 91c0332dd..447786083 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHeaterShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcHeaterShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHockeyStick.png b/src/main/resources/assets/customnpcs/textures/items/npcHockeyStick.png index 7dc674524..e29f1334c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHockeyStick.png and b/src/main/resources/assets/customnpcs/textures/items/npcHockeyStick.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png b/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png index 8feb36ba3..bbf6c2225 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png.mcmeta new file mode 100644 index 000000000..73c48e3ab --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcHolySpell.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 4, + "interpolate": false, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png index b631ebff8..9eff43024 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png.mcmeta new file mode 100644 index 000000000..88e1ebb35 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcIceSpell.png.mcmeta @@ -0,0 +1,47 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, { + "index": 1, + "time": 2 + }, { + "index": 2, + "time": 2 + }, { + "index": 3, + "time": 2 + }, { + "index": 4, + "time": 2 + }, { + "index": 5, + "time": 2 + }, { + "index": 6, + "time": 2 + }, { + "index": 7, + "time": 2 + }, { + "index": 8, + "time": 2 + }, { + "index": 9, + "time": 2 + }, { + "index": 10, + "time": 2 + }, { + "index": 11, + "time": 2 + }, { + "index": 12, + "time": 2 + } + ] + } +} diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcIronBattleAxe.png index 4f3cd93df..5dc74d136 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcIronBroadsword.png index 146bef514..46618b8e1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcIronBullet.png index 77539c43e..7b5390e0a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcIronDagger.png index be0b90c5d..f4d129929 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcIronGlaive.png index 87214cbbf..20c4959fa 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronGun.png b/src/main/resources/assets/customnpcs/textures/items/npcIronGun.png index ec01d392a..c0610cf32 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcIronHalberd.png index ffb1dc2aa..c030761af 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronMace.png b/src/main/resources/assets/customnpcs/textures/items/npcIronMace.png index 6a586a4b5..31a54e9a7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcIronScythe.png index b82f3c174..444dc5074 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronShield.png b/src/main/resources/assets/customnpcs/textures/items/npcIronShield.png index b79e19987..796fcd4f4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcIronSpear.png index 91c56fcd3..4f38f2c86 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcIronStaff.png index eebbb6deb..4ff04651a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcIronTrident.png index 6ed9227ec..cfce49502 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcIronWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcIronWarhammer.png index d617eff3b..ee37f6d13 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcIronWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcIronWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKatana.png b/src/main/resources/assets/customnpcs/textures/items/npcKatana.png index 381ca28a7..e8ee0d8ec 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKatana.png and b/src/main/resources/assets/customnpcs/textures/items/npcKatana.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKatar.png b/src/main/resources/assets/customnpcs/textures/items/npcKatar.png index 70a142743..4789c441a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKatar.png and b/src/main/resources/assets/customnpcs/textures/items/npcKatar.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKey.png b/src/main/resources/assets/customnpcs/textures/items/npcKey.png index d5fd98d71..afe1d2e2a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKey.png and b/src/main/resources/assets/customnpcs/textures/items/npcKey.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKey2.png b/src/main/resources/assets/customnpcs/textures/items/npcKey2.png index d5e55fa2c..52d877e83 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKey2.png and b/src/main/resources/assets/customnpcs/textures/items/npcKey2.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKukri.png b/src/main/resources/assets/customnpcs/textures/items/npcKukri.png index 1ee66a727..960c31978 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKukri.png and b/src/main/resources/assets/customnpcs/textures/items/npcKukri.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcKunai.png b/src/main/resources/assets/customnpcs/textures/items/npcKunai.png index 02d16001f..4ab40815a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcKunai.png and b/src/main/resources/assets/customnpcs/textures/items/npcKunai.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcLeadPipe.png b/src/main/resources/assets/customnpcs/textures/items/npcLeadPipe.png index 6abdf3139..5c0c48c4d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcLeadPipe.png and b/src/main/resources/assets/customnpcs/textures/items/npcLeadPipe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcLeafBlade.png b/src/main/resources/assets/customnpcs/textures/items/npcLeafBlade.png index 11c66486a..a13a845ee 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcLeafBlade.png and b/src/main/resources/assets/customnpcs/textures/items/npcLeafBlade.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png index 08964145e..e3d218d37 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png.mcmeta new file mode 100644 index 000000000..42ab6a5ea --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcLightningSpell.png.mcmeta @@ -0,0 +1,18 @@ +{ + "animation": { + "frametime": 2, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcLocket.png b/src/main/resources/assets/customnpcs/textures/items/npcLocket.png index d054aa38e..7836e0258 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcLocket.png and b/src/main/resources/assets/customnpcs/textures/items/npcLocket.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMachineGun.png b/src/main/resources/assets/customnpcs/textures/items/npcMachineGun.png index 37219cdb2..ace80fcda 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMachineGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcMachineGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMacuahuitl.png b/src/main/resources/assets/customnpcs/textures/items/npcMacuahuitl.png index 946841daf..f5ab24a8d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMacuahuitl.png and b/src/main/resources/assets/customnpcs/textures/items/npcMacuahuitl.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMagicWand.png b/src/main/resources/assets/customnpcs/textures/items/npcMagicWand.png index b1618a934..7479eda60 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMagicWand.png and b/src/main/resources/assets/customnpcs/textures/items/npcMagicWand.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMana.png b/src/main/resources/assets/customnpcs/textures/items/npcMana.png index 5baf290ac..2a956fe46 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMana.png and b/src/main/resources/assets/customnpcs/textures/items/npcMana.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilBattleAxe.png index 0d368b6b3..57879e82c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilBroadsword.png index 928d88c00..66cd66e9b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilDagger.png index 00373fa5e..f17170952 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilGlaive.png index 0cbb664e4..6a164c270 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilHalberd.png index 7f489986a..addad904f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilIngot.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilIngot.png index dc180ac4a..6747cab1a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilIngot.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilIngot.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilMace.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilMace.png index 13fd73e7d..df44520e7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilScythe.png index 3e89468ce..e458e0a38 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilShield.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilShield.png index ab67cb3b3..e1b981096 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilSpear.png index 16b024303..d4e9ee41a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilStaff.png index aa3755c26..fad3e997e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilSword.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilSword.png index 216739ede..5a071c5d4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilSword.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilSword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilTrident.png index 66adca090..271c08d52 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMithrilWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcMithrilWarhammer.png index af12babd4..3e81c8b7a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMithrilWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcMithrilWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMoney.png b/src/main/resources/assets/customnpcs/textures/items/npcMoney.png index 4b8c3e744..37974c2db 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMoney.png and b/src/main/resources/assets/customnpcs/textures/items/npcMoney.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcMusket.png b/src/main/resources/assets/customnpcs/textures/items/npcMusket.png index ab19c3718..0a42be9de 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcMusket.png and b/src/main/resources/assets/customnpcs/textures/items/npcMusket.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png b/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png index 99d627f05..47f748dd6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png and b/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png.mcmeta new file mode 100644 index 000000000..a14e88b0e --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcNatureSpell.png.mcmeta @@ -0,0 +1,13 @@ +{ + "animation": { + "frametime": 4, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcNecklace.png b/src/main/resources/assets/customnpcs/textures/items/npcNecklace.png index 14765c86f..d65cc967e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcNecklace.png and b/src/main/resources/assets/customnpcs/textures/items/npcNecklace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcNinjaClaw.png b/src/main/resources/assets/customnpcs/textures/items/npcNinjaClaw.png index 5bf879a2e..102fc531c 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcNinjaClaw.png and b/src/main/resources/assets/customnpcs/textures/items/npcNinjaClaw.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcOcarina.png b/src/main/resources/assets/customnpcs/textures/items/npcOcarina.png index 0d59a840f..df0cf7185 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcOcarina.png and b/src/main/resources/assets/customnpcs/textures/items/npcOcarina.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcOrb.png b/src/main/resources/assets/customnpcs/textures/items/npcOrb.png index a88d7be9d..ef651c6ab 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcOrb.png and b/src/main/resources/assets/customnpcs/textures/items/npcOrb.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcPendant.png b/src/main/resources/assets/customnpcs/textures/items/npcPendant.png index 896524b7c..a1fc97206 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcPendant.png and b/src/main/resources/assets/customnpcs/textures/items/npcPendant.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcPhone.png b/src/main/resources/assets/customnpcs/textures/items/npcPhone.png index 57926138d..b56383c80 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcPhone.png and b/src/main/resources/assets/customnpcs/textures/items/npcPhone.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcPipeWrench.png b/src/main/resources/assets/customnpcs/textures/items/npcPipeWrench.png index f35ad0065..db9e882f3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcPipeWrench.png and b/src/main/resources/assets/customnpcs/textures/items/npcPipeWrench.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcPlans.png b/src/main/resources/assets/customnpcs/textures/items/npcPlans.png index 94aff68d9..52dbea9a9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcPlans.png and b/src/main/resources/assets/customnpcs/textures/items/npcPlans.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcRapier.png b/src/main/resources/assets/customnpcs/textures/items/npcRapier.png index 2aaa72aa5..e6fd899ac 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcRapier.png and b/src/main/resources/assets/customnpcs/textures/items/npcRapier.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcRing.png b/src/main/resources/assets/customnpcs/textures/items/npcRing.png index 3af0297b3..b76b7906e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcRing.png and b/src/main/resources/assets/customnpcs/textures/items/npcRing.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcRuby.png b/src/main/resources/assets/customnpcs/textures/items/npcRuby.png index fb4dacdf4..cf997d4f4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcRuby.png and b/src/main/resources/assets/customnpcs/textures/items/npcRuby.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSaber.png b/src/main/resources/assets/customnpcs/textures/items/npcSaber.png index d843ca31b..3bcb921dc 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSaber.png and b/src/main/resources/assets/customnpcs/textures/items/npcSaber.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSaiBlade.png b/src/main/resources/assets/customnpcs/textures/items/npcSaiBlade.png index faf19adee..1e2be8579 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSaiBlade.png and b/src/main/resources/assets/customnpcs/textures/items/npcSaiBlade.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSaphire.png b/src/main/resources/assets/customnpcs/textures/items/npcSaphire.png index 94684056d..712e9e378 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSaphire.png and b/src/main/resources/assets/customnpcs/textures/items/npcSaphire.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSatchel.png b/src/main/resources/assets/customnpcs/textures/items/npcSatchel.png index 18f582cad..61da7c05d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSatchel.png and b/src/main/resources/assets/customnpcs/textures/items/npcSatchel.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcScutumShield.png b/src/main/resources/assets/customnpcs/textures/items/npcScutumShield.png index b6ea9696b..fb40ae702 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcScutumShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcScutumShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSeveredEar.png b/src/main/resources/assets/customnpcs/textures/items/npcSeveredEar.png index 50e879c27..eaf1ab0f5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSeveredEar.png and b/src/main/resources/assets/customnpcs/textures/items/npcSeveredEar.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcShuriken.png b/src/main/resources/assets/customnpcs/textures/items/npcShuriken.png index f32d71c69..b490a1382 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcShuriken.png and b/src/main/resources/assets/customnpcs/textures/items/npcShuriken.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSilk.png b/src/main/resources/assets/customnpcs/textures/items/npcSilk.png index ff4ffa9d8..b461195c1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSilk.png and b/src/main/resources/assets/customnpcs/textures/items/npcSilk.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSkull.png b/src/main/resources/assets/customnpcs/textures/items/npcSkull.png index ca8e46ac2..1be7951db 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSkull.png and b/src/main/resources/assets/customnpcs/textures/items/npcSkull.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSledgeHammer.png b/src/main/resources/assets/customnpcs/textures/items/npcSledgeHammer.png index d6b2f11de..b7a77642d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSledgeHammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcSledgeHammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSlingshot.png b/src/main/resources/assets/customnpcs/textures/items/npcSlingshot.png index 812373a5b..167850c2a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSlingshot.png and b/src/main/resources/assets/customnpcs/textures/items/npcSlingshot.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneEmpty.png b/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneEmpty.png index 84644f850..ed93d3e3a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneEmpty.png and b/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneEmpty.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneFilled.png b/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneFilled.png index 2692d78c8..bb73e7fd6 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneFilled.png and b/src/main/resources/assets/customnpcs/textures/items/npcSoulstoneFilled.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStatuette.png b/src/main/resources/assets/customnpcs/textures/items/npcStatuette.png index bbea8a79f..408bb4d0f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStatuette.png and b/src/main/resources/assets/customnpcs/textures/items/npcStatuette.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSteelClaw.png b/src/main/resources/assets/customnpcs/textures/items/npcSteelClaw.png index 5ee899f65..6abd6c0a8 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSteelClaw.png and b/src/main/resources/assets/customnpcs/textures/items/npcSteelClaw.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneBattleAxe.png index fecb95f70..7ccdd61b3 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneBroadsword.png index f8df4acc7..e52ea69f2 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneBullet.png index 8d5d4d054..d0e09e4e4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneDagger.png index 5356de876..36584f4af 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneGlaive.png index a1ce5844b..a66966fa4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneGun.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneGun.png index e18573320..d9a2e43f9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneHalberd.png index b7fd69b65..b87663ab1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneMace.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneMace.png index cd9256734..f9b323422 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneScythe.png index e3c62ecba..d4eb751e1 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneShield.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneShield.png index 85582bd2f..5f39edd99 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneSpear.png index 2eab76173..0e41c002e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneStaff.png index df875a218..75423d18e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneTrident.png index 2cd88764f..82d990bab 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcStoneWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcStoneWarhammer.png index ade73b7ae..df63e4479 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcStoneWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcStoneWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcSwissArmyKnife.png b/src/main/resources/assets/customnpcs/textures/items/npcSwissArmyKnife.png index 7bc6c3307..cbdde67fd 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcSwissArmyKnife.png and b/src/main/resources/assets/customnpcs/textures/items/npcSwissArmyKnife.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcTablet.png b/src/main/resources/assets/customnpcs/textures/items/npcTablet.png index 5a070babd..efa02d6d4 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcTablet.png and b/src/main/resources/assets/customnpcs/textures/items/npcTablet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcTowerShield.png b/src/main/resources/assets/customnpcs/textures/items/npcTowerShield.png index 0bbf5c177..931924b82 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcTowerShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcTowerShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcUsbStick.png b/src/main/resources/assets/customnpcs/textures/items/npcUsbStick.png index 6588d7d47..ac186785d 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcUsbStick.png and b/src/main/resources/assets/customnpcs/textures/items/npcUsbStick.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcViolin.png b/src/main/resources/assets/customnpcs/textures/items/npcViolin.png index 750c11b5c..3102dfffd 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcViolin.png and b/src/main/resources/assets/customnpcs/textures/items/npcViolin.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcViolinBow.png b/src/main/resources/assets/customnpcs/textures/items/npcViolinBow.png index e8bbfeefd..e025c8657 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcViolinBow.png and b/src/main/resources/assets/customnpcs/textures/items/npcViolinBow.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png b/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png index 729f5e997..90b42b829 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png and b/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png.mcmeta b/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png.mcmeta new file mode 100644 index 000000000..50f0f2fd8 --- /dev/null +++ b/src/main/resources/assets/customnpcs/textures/items/npcWaterElement.png.mcmeta @@ -0,0 +1,14 @@ +{ + "animation": { + "frametime": 4, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBattleAxe.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBattleAxe.png index 9001b0cff..9f52230c0 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBattleAxe.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBattleAxe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBroadsword.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBroadsword.png index 20ba4c525..e24a11e8b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBroadsword.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBroadsword.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBullet.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBullet.png index edfd69702..b104d6035 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenBullet.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenBullet.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenDagger.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenDagger.png index bf0bdc208..bcf61ae2e 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenDagger.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenDagger.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenGlaive.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenGlaive.png index caed1c844..164612537 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenGlaive.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenGlaive.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenGun.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenGun.png index 67fcb436c..38a7789d5 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenGun.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenGun.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenHalberd.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenHalberd.png index 1c0277b3a..107231607 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenHalberd.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenHalberd.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenMace.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenMace.png index ded07fd08..f1abfb54a 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenMace.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenMace.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenScythe.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenScythe.png index a89f2f022..d5371b752 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenScythe.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenScythe.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenShield.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenShield.png index 77bc939ec..1daffa97f 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenShield.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenShield.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenSpear.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenSpear.png index 96d201da2..bdee6834b 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenSpear.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenSpear.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenStaff.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenStaff.png index 78bf2e68c..2121d7ed9 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenStaff.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenStaff.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenTrident.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenTrident.png index 72f7257a4..345b415fa 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenTrident.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenTrident.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWoodenWarhammer.png b/src/main/resources/assets/customnpcs/textures/items/npcWoodenWarhammer.png index c4137118b..81406bcea 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWoodenWarhammer.png and b/src/main/resources/assets/customnpcs/textures/items/npcWoodenWarhammer.png differ diff --git a/src/main/resources/assets/customnpcs/textures/items/npcWrench.png b/src/main/resources/assets/customnpcs/textures/items/npcWrench.png index 8b434150e..032b6d0d7 100644 Binary files a/src/main/resources/assets/customnpcs/textures/items/npcWrench.png and b/src/main/resources/assets/customnpcs/textures/items/npcWrench.png differ