diff --git a/src/main/java/twilightforest/item/RegisterItemEvent.java b/src/main/java/twilightforest/item/RegisterItemEvent.java index b56fb8e322..1a5e0aae0c 100644 --- a/src/main/java/twilightforest/item/RegisterItemEvent.java +++ b/src/main/java/twilightforest/item/RegisterItemEvent.java @@ -47,10 +47,10 @@ public static void onRegisterItems(RegistryEvent.Register event) { items.register("naga_scale", "nagaScale", new ItemTF(EnumRarity.UNCOMMON)); items.register("naga_chestplate", "plateNaga", new ItemTFNagaArmor(ARMOR_NAGA, CHEST, EnumRarity.UNCOMMON).setMaxStackSize(1)); items.register("naga_leggings", "legsNaga", new ItemTFNagaArmor(ARMOR_NAGA, LEGS, EnumRarity.UNCOMMON).setMaxStackSize(1)); - items.register("twilight_scepter", "scepterTwilight", new ItemTFScepterTwilight(EnumRarity.UNCOMMON, 99)); - items.register("lifedrain_scepter", "scepterLifeDrain", new ItemTFScepterLifeDrain(EnumRarity.UNCOMMON, 99)); - items.register("zombie_scepter", "scepterZombie", new ItemTFScepterZombie(EnumRarity.UNCOMMON, 9)); - items.register("shield_scepter", "scepterShield", new ItemTFScepterShield(EnumRarity.UNCOMMON, 9)); + items.register("twilight_scepter", "scepterTwilight", new ItemTFScepterTwilight(EnumRarity.UNCOMMON, 999)); + items.register("lifedrain_scepter", "scepterLifeDrain", new ItemTFScepterLifeDrain(EnumRarity.UNCOMMON, 999)); + items.register("zombie_scepter", "scepterZombie", new ItemTFScepterZombie(EnumRarity.UNCOMMON, 99)); + items.register("shield_scepter", "scepterShield", new ItemTFScepterShield(EnumRarity.UNCOMMON, 99)); //items.register("Wand of Pacification [NYI]", new ItemTF().setIconIndex(6).setTranslationKey("wandPacification").setMaxStackSize(1)); //items.register("ore_meter", "oreMeter", new ItemTFOreMeter().setMaxStackSize(1)); items.register("magic_map", "magicMap", new ItemTFMagicMap().setMaxStackSize(1)); diff --git a/src/main/java/twilightforest/item/scepter/ItemTFScepterLifeDrain.java b/src/main/java/twilightforest/item/scepter/ItemTFScepterLifeDrain.java index a84643dd3c..6c7cb6afb9 100644 --- a/src/main/java/twilightforest/item/scepter/ItemTFScepterLifeDrain.java +++ b/src/main/java/twilightforest/item/scepter/ItemTFScepterLifeDrain.java @@ -97,7 +97,7 @@ public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { if (target instanceof EntityLiving) { ((EntityLiving) target).spawnExplosionParticle(); } - target.playSound(SoundEvents.ENTITY_GENERIC_BIG_FALL, 1.0F, ((itemRand.nextFloat() - itemRand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + target.playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0F, ((itemRand.nextFloat() - itemRand.nextFloat()) * 0.7F + 1.0F) * 2.0F); spawnShatteringParticles(world, target); if (!world.isRemote) { target.setDead(); @@ -131,7 +131,7 @@ public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { // this is a new creature to start draining spawnRedParticles(world, living.posX, living.posY + living.getEyeHeight(), living.posZ, target.posX, target.posY + target.getEyeHeight(), target.posZ); - living.playSound(SoundEvents.ITEM_FLINTANDSTEEL_USE, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + living.playSound(SoundEvents.ENTITY_ZOMBIE_INFECT, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); if (!world.isRemote) { target.attackEntityFrom(DamageSource.causeIndirectMagicDamage(living, living), 1); diff --git a/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java b/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java index a713a56755..d51808ed28 100644 --- a/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java +++ b/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java @@ -35,7 +35,7 @@ public ActionResult onItemRightClick(World world, EntityPlayer player if (stack.getItemDamage() == stack.getMaxDamage()) { return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand)); } else { - player.playSound(SoundEvents.ENTITY_GHAST_SHOOT, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + player.playSound(SoundEvents.ENTITY_ENDEREYE_LAUNCH, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); if (!world.isRemote) { world.spawnEntity(new EntityTFTwilightWandBolt(world, player));